LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Using hard-fp

Browse Source 
- Immersive mode in android-19
- Fixed local reference release in JNI helper
- Misc fixes
Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6
This commit is contained in:
Hak Matsuda
2013-11-09 01:03:15 -08:00
committed by Andrew Hsieh
parent 1f1e737907
commit cc69f210a7
13 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndk/platforms/android-17/samples/Teapot/AndroidManifest.xml
View File

@@ -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

8
ndk/platforms/android-17/samples/Teapot/jni/Android.mk
View File

@@ -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)

2
ndk/platforms/android-17/samples/Teapot/project.properties
View File

@@ -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

8
ndk/platforms/android-17/samples/Teapot/src/com/sample/teapot/TeapotNativeActivity.java
View File

@@ -42,10 +42,16 @@ public class TeapotNativeActivity extends NativeActivity {
{
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

2
ndk/platforms/android-18/samples/MoreTeapots/AndroidManifest.xml
View File

@@ -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

8
ndk/platforms/android-18/samples/MoreTeapots/jni/Android.mk
View File

@@ -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)

2
ndk/platforms/android-18/samples/MoreTeapots/jni/MoreTeapotsNativeActivity.cpp
View File

@@ -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.

2
ndk/platforms/android-18/samples/MoreTeapots/project.properties
View File

@@ -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

14
ndk/platforms/android-18/samples/MoreTeapots/src/com/sample/moreteapots/MoreTeapotsNativeActivity.java
View File

@@ -38,12 +38,20 @@ public class MoreTeapotsNativeActivity extends NativeActivity {
//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()

10
ndk/sources/android/ndk_helper/Android.mk
View File

@@ -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)

6
ndk/sources/android/ndk_helper/JNIHelper.cpp
View File

@@ -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_ );