Merge "- Using hard-fp - Immersive mode in android-19 - Fixed local reference release in JNI helper - Misc fixes Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6"

Andrew Hsieh · Gerrit Code Review · commit c044b5e3673e · 2013-11-21T08:08:22.000Z
diff --git a/ndk/platforms/android-17/samples/Teapot/AndroidManifest.xml b/ndk/platforms/android-17/samples/Teapot/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
     <uses-sdk
         android:minSdkVersion="11"
-        android:targetSdkVersion="17" />
+        android:targetSdkVersion="19" />
     <uses-feature android:glEsVersion="0x00020000"></uses-feature>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
     <application
diff --git a/ndk/platforms/android-17/samples/Teapot/jni/Android.mk b/ndk/platforms/android-17/samples/Teapot/jni/Android.mk
@@ -13,6 +13,14 @@ LOCAL_CFLAGS :=
 LOCAL_LDLIBS    := -llog -landroid -lEGL -lGLESv2
 LOCAL_STATIC_LIBRARIES := cpufeatures android_native_app_glue ndk_helper
 
+ifneq ($(filter %armeabi-v7a,$(TARGET_ARCH_ABI)),)
+LOCAL_CFLAGS += -mhard-float -D_NDK_MATH_NO_SOFTFP=1
+LOCAL_LDLIBS += -lm_hard
+ifeq (,$(filter -fuse-ld=mcld,$(APP_LDFLAGS) $(LOCAL_LDFLAGS)))
+LOCAL_LDFLAGS += -Wl,--no-warn-mismatch
+endif
+endif
+
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,android/ndk_helper)
diff --git a/ndk/platforms/android-17/samples/Teapot/jni/Application.mk b/ndk/platforms/android-17/samples/Teapot/jni/Application.mk
@@ -1,4 +1,4 @@
 APP_PLATFORM := android-9
 APP_ABI := all
 
-APP_STL := stlport_static
+APP_STL := stlport_static
diff --git a/ndk/platforms/android-17/samples/Teapot/project.properties b/ndk/platforms/android-17/samples/Teapot/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=Google Inc.:Google APIs:17
+target=Google Inc.:Google APIs:19
diff --git a/ndk/platforms/android-17/samples/Teapot/src/com/sample/teapot/TeapotNativeActivity.java b/ndk/platforms/android-17/samples/Teapot/src/com/sample/teapot/TeapotNativeActivity.java
@@ -42,10 +42,16 @@ protected void onResume() {
         {
             getWindow().getDecorView().setSystemUiVisibility(View.STATUS_BAR_HIDDEN);
         }
-        else if(SDK_INT >= 14)
+        else if(SDK_INT >= 14 && SDK_INT < 19)
         {
             getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_LOW_PROFILE);
         }
+        else if(SDK_INT >= 19)
+        {
+            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
+        }
 
     }
     // Our popup window, you will call it from your C/C++ code later
diff --git a/ndk/platforms/android-18/samples/MoreTeapots/AndroidManifest.xml b/ndk/platforms/android-18/samples/MoreTeapots/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
     <uses-sdk
         android:minSdkVersion="11"
-        android:targetSdkVersion="17" />
+        android:targetSdkVersion="19" />
     <uses-feature android:glEsVersion="0x00020000"></uses-feature>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
     <application
diff --git a/ndk/platforms/android-18/samples/MoreTeapots/jni/Android.mk b/ndk/platforms/android-18/samples/MoreTeapots/jni/Android.mk
@@ -12,6 +12,14 @@ LOCAL_CFLAGS :=
 LOCAL_LDLIBS    := -llog -landroid -lEGL -lGLESv2
 LOCAL_STATIC_LIBRARIES := cpufeatures android_native_app_glue ndk_helper
 
+ifneq ($(filter %armeabi-v7a,$(TARGET_ARCH_ABI)),)
+LOCAL_CFLAGS += -mhard-float -D_NDK_MATH_NO_SOFTFP=1
+LOCAL_LDLIBS += -lm_hard
+ifeq (,$(filter -fuse-ld=mcld,$(APP_LDFLAGS) $(LOCAL_LDFLAGS)))
+LOCAL_LDFLAGS += -Wl,--no-warn-mismatch
+endif
+endif
+
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,android/ndk_helper)
diff --git a/ndk/platforms/android-18/samples/MoreTeapots/jni/Application.mk b/ndk/platforms/android-18/samples/MoreTeapots/jni/Application.mk
@@ -1,4 +1,4 @@
 APP_PLATFORM := android-9
 APP_ABI := all
 
-APP_STL := stlport_static
+APP_STL := stlport_static
diff --git a/ndk/platforms/android-18/samples/MoreTeapots/jni/MoreTeapotsNativeActivity.cpp b/ndk/platforms/android-18/samples/MoreTeapots/jni/MoreTeapotsNativeActivity.cpp
@@ -41,7 +41,7 @@
 //-------------------------------------------------------------------------
 const int32_t NUM_TEAPOTS_X = 8;
 const int32_t NUM_TEAPOTS_Y = 8;
-const int32_t NUM_TEAPOTS_Z = 6;
+const int32_t NUM_TEAPOTS_Z = 8;
 
 //-------------------------------------------------------------------------
 //Shared state for our app.
diff --git a/ndk/platforms/android-18/samples/MoreTeapots/project.properties b/ndk/platforms/android-18/samples/MoreTeapots/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=Google Inc.:Google APIs:17
+target=Google Inc.:Google APIs:19
diff --git a/ndk/platforms/android-18/samples/MoreTeapots/src/com/sample/moreteapots/MoreTeapotsNativeActivity.java b/ndk/platforms/android-18/samples/MoreTeapots/src/com/sample/moreteapots/MoreTeapotsNativeActivity.java
@@ -38,12 +38,20 @@ protected void onResume() {
 
         //Hide toolbar
         int SDK_INT = android.os.Build.VERSION.SDK_INT;
-        if(SDK_INT >= 11 && SDK_INT < 14) {
+        if(SDK_INT >= 11 && SDK_INT < 14)
+        {
             getWindow().getDecorView().setSystemUiVisibility(View.STATUS_BAR_HIDDEN);
-        }else if(SDK_INT >= 14){
+        }
+        else if(SDK_INT >= 14 && SDK_INT < 19)
+        {
             getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_LOW_PROFILE);
         }
-
+        else if(SDK_INT >= 19)
+        {
+            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
+        }
     }
 
     protected void onPause()
diff --git a/ndk/sources/android/ndk_helper/Android.mk b/ndk/sources/android/ndk_helper/Android.mk
@@ -10,6 +10,16 @@ LOCAL_EXPORT_LDLIBS    := -llog -landroid -lEGL -lGLESv2
 
 LOCAL_STATIC_LIBRARIES := cpufeatures android_native_app_glue
 
+
+ifneq ($(filter %armeabi-v7a,$(TARGET_ARCH_ABI)),)
+LOCAL_CFLAGS += -mhard-float -D_NDK_MATH_NO_SOFTFP=1
+LOCAL_EXPORT_CFLAGS += -mhard-float -D_NDK_MATH_NO_SOFTFP=1
+LOCAL_EXPORT_LDLIBS += -lm_hard
+ifeq (,$(filter -fuse-ld=mcld,$(APP_LDFLAGS) $(LOCAL_LDFLAGS)))
+LOCAL_EXPORT_LDFLAGS += -Wl,--no-warn-mismatch
+endif
+endif
+
 include $(BUILD_STATIC_LIBRARY)
 
 #$(call import-module,android/native_app_glue)
diff --git a/ndk/sources/android/ndk_helper/JNIHelper.cpp b/ndk/sources/android/ndk_helper/JNIHelper.cpp
@@ -131,8 +131,8 @@ bool JNIHelper::ReadFile( const char* fileName,
     s.append( fileName );
     std::ifstream f( s.c_str(), std::ios::binary );
 
-    env->DeleteLocalRef( str_path );
     env->ReleaseStringUTFChars( str_path, path );
+    env->DeleteLocalRef( str_path );
     activity_->vm->DetachCurrentThread();
 
     if( f )
@@ -197,8 +197,8 @@ std::string JNIHelper::GetExternalFilesDir()
     const char* path = env->GetStringUTFChars( strPath, NULL );
     std::string s( path );
 
-    env->DeleteLocalRef( strPath );
     env->ReleaseStringUTFChars( strPath, path );
+    env->DeleteLocalRef( strPath );
     activity_->vm->DetachCurrentThread();
 
     pthread_mutex_unlock( &mutex_ );
@@ -277,9 +277,9 @@ std::string JNIHelper::ConvertString( const char* str,
 
     std::string s = std::string( cparam );
 
+    env->ReleaseStringUTFChars( object, cparam );
     env->DeleteLocalRef( strEncode );
     env->DeleteLocalRef( object );
-    env->ReleaseStringUTFChars( object, cparam );
     activity_->vm->DetachCurrentThread();
     pthread_mutex_unlock( &mutex_ );
 

Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,16 @@ protected void onResume() {`
`42`	`42`	`{`
`43`	`43`	`getWindow().getDecorView().setSystemUiVisibility(View.STATUS_BAR_HIDDEN);`
`44`	`44`	`}`
`45`		`- else if(SDK_INT >= 14)`
	`45`	`+ else if(SDK_INT >= 14 && SDK_INT < 19)`
`46`	`46`	`{`
`47`	`47`	`getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN \| View.SYSTEM_UI_FLAG_LOW_PROFILE);`
`48`	`48`	`}`
	`49`	`+ else if(SDK_INT >= 19)`
	`50`	`+ {`
	`51`	`+ getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN`
	`52`	`+ \| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION`
	`53`	`+ \| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);`
	`54`	`+ }`
`49`	`55`
`50`	`56`	`}`
`51`	`57`	`// Our popup window, you will call it from your C/C++ code later`