am 3bc200de: am 9864b880: Merge "Replace deprecated APIs in NDK samples"

* commit '3bc200de51c0afc6f954aaba5d029e1fb4d115e7': Replace deprecated APIs in NDK samples
2012-08-30 08:25:04 -07:00
parent 980822ca28 3bc200de51
commit bef6ec841e
6 changed files with 6 additions and 6 deletions
--- a/ndk/platforms/android-5/samples/hello-gl2/default.properties
+++ b/ndk/platforms/android-5/samples/hello-gl2/default.properties
@@ -8,4 +8,4 @@
 # project structure.

 # Project target.
-target=android-5
+target=android-7
--- a/ndk/platforms/android-9/samples/native-activity/default.properties
+++ b/ndk/platforms/android-9/samples/native-activity/default.properties
@@ -8,4 +8,4 @@
 # project structure.

 # Project target.
-target=android-9
+target=android-10
--- a/ndk/platforms/android-9/samples/native-activity/jni/Application.mk
+++ b/ndk/platforms/android-9/samples/native-activity/jni/Application.mk
@@ -1 +1 @@
-APP_PLATFORM := android-9
+APP_PLATFORM := android-10
--- a/ndk/platforms/android-9/samples/native-audio/default.properties
+++ b/ndk/platforms/android-9/samples/native-audio/default.properties
@@ -8,6 +8,6 @@
 # project structure.

 # Project target.
-target=android-9
+target=android-10
 # Indicates whether an apk should be generated for each density.
 split.density=false
--- a/ndk/platforms/android-9/samples/native-plasma/default.properties
+++ b/ndk/platforms/android-9/samples/native-plasma/default.properties
@@ -8,4 +8,4 @@
 # project structure.

 # Project target.
-target=android-9
+target=android-10
--- a/ndk/platforms/android-9/samples/native-plasma/jni/Application.mk
+++ b/ndk/platforms/android-9/samples/native-plasma/jni/Application.mk
@@ -1,3 +1,3 @@
 # The ARMv7 is significanly faster due to the use of the hardware FPU
 APP_ABI := armeabi armeabi-v7a
-APP_PLATFORM := android-9
+APP_PLATFORM := android-10