From a79e56e2f89d1ace57e5afa4af5919da5e503f5c Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Tue, 20 Mar 2012 12:46:16 +0800
Subject: [PATCH] Fixed inconsistent minSdkVersion and target= in NDK samples

Also removed Dummy.java and auto-gen files
Inspired by http://code.google.com/p/android/issues/detail?id=20017
---
 .../android-8/samples/bitmap-plasma/default.properties        | 2 +-
 .../android-9/samples/native-activity/default.properties      | 2 +-
 .../android-9/samples/native-plasma/AndroidManifest.xml       | 2 +-
 .../android-9/samples/native-plasma/default.properties        | 2 +-
 ndk/platforms/android-9/samples/native-plasma/src/Dummy.java  | 4 ----
 ndk/samples/hello-jni/default.properties                      | 2 +-
 ndk/samples/hello-neon/AndroidManifest.xml                    | 1 +
 ndk/samples/hello-neon/default.properties                     | 2 +-
 8 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 ndk/platforms/android-9/samples/native-plasma/src/Dummy.java

diff --git a/ndk/platforms/android-8/samples/bitmap-plasma/default.properties b/ndk/platforms/android-8/samples/bitmap-plasma/default.properties
index 9a2c9f6c8..0b9250e02 100644
--- 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
diff --git a/ndk/platforms/android-9/samples/native-activity/default.properties b/ndk/platforms/android-9/samples/native-activity/default.properties
index 9d135cb85..9a2c9f6c8 100644
--- 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
diff --git a/ndk/platforms/android-9/samples/native-plasma/AndroidManifest.xml b/ndk/platforms/android-9/samples/native-plasma/AndroidManifest.xml
index 28408b9b0..43acf0d27 100644
--- 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"
diff --git a/ndk/platforms/android-9/samples/native-plasma/default.properties b/ndk/platforms/android-9/samples/native-plasma/default.properties
index 9d135cb85..9a2c9f6c8 100644
--- 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
diff --git a/ndk/platforms/android-9/samples/native-plasma/src/Dummy.java b/ndk/platforms/android-9/samples/native-plasma/src/Dummy.java
deleted file mode 100644
index 596215a48..000000000
--- a/ndk/platforms/android-9/samples/native-plasma/src/Dummy.java
+++ /dev/null
@@ -1,4 +0,0 @@
-// Temporary until the NDK build system can deal with there being no Java source.
-class Dummy {
-
-}
diff --git a/ndk/samples/hello-jni/default.properties b/ndk/samples/hello-jni/default.properties
index 0b9250e02..4513a1e4f 100644
--- 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
diff --git a/ndk/samples/hello-neon/AndroidManifest.xml b/ndk/samples/hello-neon/AndroidManifest.xml
index 2d362d688..ff06e0995 100644
--- 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">
diff --git a/ndk/samples/hello-neon/default.properties b/ndk/samples/hello-neon/default.properties
index 4513a1e4f..9d79b12c7 100644
--- 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