am 7ea377d2: am ac1d40cf: Merge "Fixed inconsistent minSdkVersion and target= in NDK samples"

* commit '7ea377d2a7f8557545259698e6d8e4536ceadc2a': Fixed inconsistent minSdkVersion and target= in NDK samples
2012-04-02 00:43:55 -07:00
parent 4ab5bd9deb 7ea377d2a7
commit 3e5127efe4
8 changed files with 7 additions and 10 deletions
--- a/ndk/platforms/android-8/samples/bitmap-plasma/default.properties
+++ b/ndk/platforms/android-8/samples/bitmap-plasma/default.properties
@@ -8,4 +8,4 @@
 # project structure.

 # Project target.
-target=android-9
+target=android-8
--- 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-7
+target=android-9
--- a/ndk/platforms/android-9/samples/native-plasma/AndroidManifest.xml
+++ b/ndk/platforms/android-9/samples/native-plasma/AndroidManifest.xml
@@ -3,7 +3,7 @@
      package="com.example.native_plasma"
      android:versionCode="1"
      android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="8" />
+    <uses-sdk android:minSdkVersion="9" />
    <application android:label="@string/app_name"
                 android:hasCode="false" android:debuggable="true">
        <activity android:name="android.app.NativeActivity"
--- 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-7
+target=android-9
--- a/ndk/platforms/android-9/samples/native-plasma/src/Dummy.java
+++ b/ndk/platforms/android-9/samples/native-plasma/src/Dummy.java
@@ -1,4 +0,0 @@
-// Temporary until the NDK build system can deal with there being no Java source.
-class Dummy {
-
-}
--- a/ndk/samples/hello-jni/default.properties
+++ b/ndk/samples/hello-jni/default.properties
@@ -8,4 +8,4 @@
 # project structure.

 # Project target.
-target=android-8
+target=android-3
--- a/ndk/samples/hello-neon/AndroidManifest.xml
+++ b/ndk/samples/hello-neon/AndroidManifest.xml
@@ -3,6 +3,7 @@
      package="com.example.neon"
      android:versionCode="1"
      android:versionName="1.0">
+    <uses-sdk android:minSdkVersion="4" />
    <application android:label="@string/app_name">
        <activity android:name=".HelloNeon"
                  android:label="@string/app_name">
--- a/ndk/samples/hello-neon/default.properties
+++ b/ndk/samples/hello-neon/default.properties
@@ -8,4 +8,4 @@
 # project structure.

 # Project target.
-target=android-3
+target=android-4