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

am c58abb6a: Merge "Rename modules NativeActivity"

Browse Source 
* commit 'c58abb6aa3dfcb526215f307b29688f5e17753b2':
  Rename modules NativeActivity
This commit is contained in:
Andrew Hsieh
2013-11-05 10:29:51 -08:00
committed by Android Git Automerger
parent 6379074e2c c58abb6aa3
commit c4ca079b03
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@
android:configChanges="orientation|keyboardHidden"> android:configChanges="orientation|keyboardHidden">
<!-- Tell NativeActivity the name of or .so --> <!-- Tell NativeActivity the name of or .so -->
<meta-data android:name="android.app.lib_name" <meta-data android:name="android.app.lib_name"
android:value="NativeActivity" /> android:value="TeapotNativeActivity" />
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />

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

@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := NativeActivity LOCAL_MODULE := TeapotNativeActivity
LOCAL_SRC_FILES := TeapotNativeActivity.cpp \ LOCAL_SRC_FILES := TeapotNativeActivity.cpp \
TeapotRenderer.cpp \ TeapotRenderer.cpp \

2
ndk/platforms/android-17/samples/Teapot/jni/TeapotNativeActivity.cpp
View File

@@ -444,7 +444,7 @@ void android_main( android_app* state )
state->onInputEvent = Engine::HandleInput; state->onInputEvent = Engine::HandleInput;
#ifdef USE_NDK_PROFILER #ifdef USE_NDK_PROFILER
monstartup("libNativeActivity.so"); monstartup("libTeapotNativeActivity.so");
#endif #endif
// Prepare to monitor accelerometer // Prepare to monitor accelerometer

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

@@ -24,7 +24,7 @@
android:configChanges="orientation|keyboardHidden"> android:configChanges="orientation|keyboardHidden">
<!-- Tell NativeActivity the name of or .so --> <!-- Tell NativeActivity the name of or .so -->
<meta-data android:name="android.app.lib_name" <meta-data android:name="android.app.lib_name"
android:value="NativeActivity" /> android:value="MoreTeapotsNativeActivity" />
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />

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

@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := NativeActivity LOCAL_MODULE := MoreTeapotsNativeActivity
LOCAL_SRC_FILES := MoreTeapotsNativeActivity.cpp \ LOCAL_SRC_FILES := MoreTeapotsNativeActivity.cpp \
MoreTeapotsRenderer.cpp \ MoreTeapotsRenderer.cpp \
@@ -16,4 +16,4 @@ include $(BUILD_SHARED_LIBRARY)
$(call import-module,android/ndk_helper) $(call import-module,android/ndk_helper)
$(call import-module,android/native_app_glue) $(call import-module,android/native_app_glue)
$(call import-module,android/cpufeatures) $(call import-module,android/cpufeatures)

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

@@ -455,7 +455,7 @@ void android_main( android_app* state )
state->onInputEvent = Engine::HandleInput; state->onInputEvent = Engine::HandleInput;
#ifdef USE_NDK_PROFILER #ifdef USE_NDK_PROFILER
monstartup("libNativeActivity.so"); monstartup("libMoreTeapotsNativeActivity.so");
#endif #endif
// Prepare to monitor accelerometer // Prepare to monitor accelerometer

2
ndk/sources/android/ndk_helper/GLContext.h
View File

@@ -15,7 +15,7 @@
*/ */
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
// glContext.h // GLContext.h
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
#ifndef GLCONTEXT_H_ #ifndef GLCONTEXT_H_
#define GLCONTEXT_H_ #define GLCONTEXT_H_