diff options
| author | Ray San <raysan5@gmail.com> | 2017-10-02 13:06:34 +0200 |
|---|---|---|
| committer | Ray San <raysan5@gmail.com> | 2017-10-02 13:06:34 +0200 |
| commit | 1288d6a5df6f8ebd17bc4abea1db330a4357ab5a (patch) | |
| tree | 4d29311c680224ccd25cd6530d296eb9795762bc /src/external/android | |
| parent | ea0decece80e8c067825a157877cb5a58f663094 (diff) | |
| download | raylib-1288d6a5df6f8ebd17bc4abea1db330a4357ab5a.tar.gz raylib-1288d6a5df6f8ebd17bc4abea1db330a4357ab5a.zip | |
Updated android_native_app_glue
Diffstat (limited to 'src/external/android')
3 files changed, 10 insertions, 14 deletions
diff --git a/src/external/android/native_app_glue/Android.mk b/src/external/android/native_app_glue/Android.mk deleted file mode 100644 index 00252fcb..00000000 --- a/src/external/android/native_app_glue/Android.mk +++ /dev/null @@ -1,10 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE:= android_native_app_glue -LOCAL_SRC_FILES:= android_native_app_glue.c -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) -LOCAL_EXPORT_LDLIBS := -llog - -include $(BUILD_STATIC_LIBRARY) diff --git a/src/external/android/native_app_glue/android_native_app_glue.c b/src/external/android/native_app_glue/android_native_app_glue.c index d503d8da..7eada086 100644 --- a/src/external/android/native_app_glue/android_native_app_glue.c +++ b/src/external/android/native_app_glue/android_native_app_glue.c @@ -420,8 +420,9 @@ static void onInputQueueDestroyed(ANativeActivity* activity, AInputQueue* queue) android_app_set_input((struct android_app*)activity->instance, NULL); } -void ANativeActivity_onCreate(ANativeActivity* activity, - void* savedState, size_t savedStateSize) { +JNIEXPORT +void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, + size_t savedStateSize) { LOGV("Creating: %p\n", activity); activity->callbacks->onDestroy = onDestroy; activity->callbacks->onStart = onStart; diff --git a/src/external/android/native_app_glue/android_native_app_glue.h b/src/external/android/native_app_glue/android_native_app_glue.h index 97202e09..c99d6e12 100644 --- a/src/external/android/native_app_glue/android_native_app_glue.h +++ b/src/external/android/native_app_glue/android_native_app_glue.h @@ -332,9 +332,14 @@ void android_app_pre_exec_cmd(struct android_app* android_app, int8_t cmd); void android_app_post_exec_cmd(struct android_app* android_app, int8_t cmd); /** - * Dummy function you can call to ensure glue code isn't stripped. + * Dummy function that used to be used to prevent the linker from stripping app + * glue code. No longer necessary, since __attribute__((visibility("default"))) + * does this for us. */ -void app_dummy(); +__attribute__(( + deprecated("Calls to app_dummy are no longer necessary. See " + "https://github.com/android-ndk/ndk/issues/381."))) void +app_dummy(); /** * This is the function that application code must implement, representing |