Merge pull request cocos2d#3999 from minggo/iss2905-adjust_folder

minggo · minggo · commit 686b7fd8128d · 2013-10-23T01:53:20.000-07:00
issue cocos2d#2905: android samples run ok
diff --git a/samples/Cpp/AssetsManagerTest/proj.android/project.properties b/samples/Cpp/AssetsManagerTest/proj.android/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-13
-android.library.reference.1=../../../../cocos2dx/platform/android/java
+target=android-10
+android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Cpp/HelloCpp/proj.android/project.properties b/samples/Cpp/HelloCpp/proj.android/project.properties
@@ -8,7 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-13
+target=android-10
 
-android.library.reference.1=../../../../cocos2dx/platform/android/java
-android.library=false
+android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Cpp/SimpleGame/proj.android/project.properties b/samples/Cpp/SimpleGame/proj.android/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-13
-android.library.reference.1=../../../../cocos2dx/platform/android/java
+target=android-10
+android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Cpp/TestCpp/proj.android/project.properties b/samples/Cpp/TestCpp/proj.android/project.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-13
+target=android-10
 
-android.library.reference.1=../../../../cocos2dx/platform/android/java
+android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Javascript/CocosDragonJS/proj.android/project.properties b/samples/Javascript/CocosDragonJS/proj.android/project.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-13
+target=android-10
 
-android.library.reference.1=../../../../cocos2dx/platform/android/java
+android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Javascript/CrystalCraze/proj.android/project.properties b/samples/Javascript/CrystalCraze/proj.android/project.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-13
+target=android-10
 
-android.library.reference.1=../../../../cocos2dx/platform/android/java
+android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Javascript/MoonWarriors/proj.android/project.properties b/samples/Javascript/MoonWarriors/proj.android/project.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-13
+target=android-10
 
-android.library.reference.1=../../../../cocos2dx/platform/android/java
+android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Javascript/TestJavascript/proj.android/project.properties b/samples/Javascript/TestJavascript/proj.android/project.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-13
+target=android-10
 
-android.library.reference.1=../../../../cocos2dx/platform/android/java
+android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/project.properties b/samples/Javascript/WatermelonWithMe/proj.android/project.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-13
+target=android-10
 
-android.library.reference.1=../../../../cocos2dx/platform/android/java
+android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Lua/HelloLua/proj.android/project.properties b/samples/Lua/HelloLua/proj.android/project.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-13
+target=android-10
 
-android.library.reference.1=../../../../cocos2dx/platform/android/java
+android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Lua/TestLua/proj.android/project.properties b/samples/Lua/TestLua/proj.android/project.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-13
+target=android-10
 
-android.library.reference.1=../../../../cocos2dx/platform/android/java
+android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/template/multi-platform-cpp/proj.android/project.properties b/template/multi-platform-cpp/proj.android/project.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-13
+target=android-10
 
-android.library.reference.1=../../../cocos2dx/platform/android/java
+android.library.reference.1=../../../cocos/2d/platform/android/java
diff --git a/template/multi-platform-js/proj.android/project.properties b/template/multi-platform-js/proj.android/project.properties
@@ -10,4 +10,4 @@
 # Project target.
 target=android-13
 
-android.library.reference.1=../../../cocos2dx/platform/android/java
+android.library.reference.1=../../../cocos/2d/platform/android/java
diff --git a/template/multi-platform-lua/proj.android/project.properties b/template/multi-platform-lua/proj.android/project.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-13
+target=android-10
 
-android.library.reference.1=../../../cocos2dx/platform/android/java
+android.library.reference.1=../../../cocos/2d/platform/android/java
