am 5c56907: Merge change 1187 into donut

Merge commit '5c569078a278f3887febeb8776bf8f354a3ded58'

* commit '5c569078a278f3887febeb8776bf8f354a3ded58':
  Change the NDK samples package names to be lower case. Also added minSdkVersion=3 in the manifests.

ndk/apps/hello-jni/project/AndroidManifest.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.example.HelloJni"
+      package="com.example.hellojni"
       android:versionCode="1"
       android:versionName="1.0">
+    <uses-sdk android:minSdkVersion="3" />
     <application android:label="@string/app_name">
         <activity android:name=".HelloJni"
                   android:label="@string/app_name">

ndk/apps/hello-jni/project/src/com/example/hellojni/HelloJni.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.example.HelloJni;
+package com.example.hellojni;
 
 import android.app.Activity;
 import android.widget.TextView;

ndk/apps/two-libs/project/AndroidManifest.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.example.TwoLib"
+      package="com.example.twolibs"
       android:versionCode="1"
       android:versionName="1.0">
+    <uses-sdk android:minSdkVersion="3" />
     <application android:label="@string/app_name">
-        <activity android:name=".TwoLib"
+        <activity android:name=".TwoLibs"
                   android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

ndk/apps/two-libs/project/src/com/example/twolibs/TwoLibs.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.example.TwoLib;
+package com.example.twolibs;
 
 import android.app.Activity;
 import android.widget.TextView;
 import android.os.Bundle;
 
-public class TwoLib extends Activity
+public class TwoLibs extends Activity
 {
     /** Called when the activity is first created. */
     @Override

ndk/sources/samples/hello-jni/hello-jni.c

@@ -24,7 +24,7 @@
  *   apps/samples/hello-jni/project/src/com/example/HelloJni/HelloJni.java
  */
 jstring
-Java_com_example_HelloJni_HelloJni_stringFromJNI( JNIEnv* env,
+Java_com_example_hellojni_HelloJni_stringFromJNI( JNIEnv* env,
                                                   jobject thiz )
 {
     return (*env)->NewStringUTF(env, "Hello from JNI !");

ndk/sources/samples/two-libs/first.h

@@ -1,6 +1,6 @@
 #ifndef FIRST_H
 #define FIRST_H
 
-extern int   first(int  x, int  y);
+extern int first(int  x, int  y);
 
 #endif /* FIRST_H */

ndk/sources/samples/two-libs/second.c

@@ -2,10 +2,10 @@
 #include <jni.h>
 
 jint
-Java_com_example_TwoLib_TwoLib_add( JNIEnv*  env,
-                                    jobject  this,
-                                    jint     x,
-                                    jint     y )
+Java_com_example_twolibs_TwoLibs_add( JNIEnv*  env,
+                                      jobject  this,
+                                      jint     x,
+                                      jint     y )
 {
     return first(x, y);
 }