diff options
| author | Cody Northrop <cnorthrop@google.com> | 2017-08-16 13:25:22 -0600 |
|---|---|---|
| committer | Cody Northrop <cnorthrop@google.com> | 2017-08-16 14:13:27 -0600 |
| commit | 74013d2e4f471df7ffa95460eb509f4220653378 (patch) | |
| tree | c861eaeec489e191af0fa6560502caa5bc9e4c83 | |
| parent | 017981f812a92665e26763f5160ba5a72a440172 (diff) | |
| download | usermoji-74013d2e4f471df7ffa95460eb509f4220653378.tar.xz | |
android: Updates for NDK r15
Removes app_dummy from apps that use native activity.
For more details refer to: https://github.com/android-ndk/ndk/issues/381
| -rw-r--r-- | build-android/jni/Android.mk | 1 | ||||
| -rw-r--r-- | common/android_util.cpp | 1 | ||||
| -rw-r--r-- | demos/android/jni/Android.mk | 1 | ||||
| -rw-r--r-- | demos/cube.c | 2 | ||||
| -rw-r--r-- | demos/smoke/ShellAndroid.cpp | 1 | ||||
| -rw-r--r-- | demos/smoke/android/CMakeLists.txt | 5 |
6 files changed, 8 insertions, 3 deletions
diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk index 36956309..eabf3940 100644 --- a/build-android/jni/Android.mk +++ b/build-android/jni/Android.mk @@ -201,6 +201,7 @@ LOCAL_SHARED_LIBRARIES += shaderc-prebuilt glslang-prebuilt OGLCompiler-prebuilt LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden -DVALIDATION_APK --include=$(SRC_DIR)/common/vulkan_wrapper.h LOCAL_WHOLE_STATIC_LIBRARIES += android_native_app_glue LOCAL_LDLIBS := -llog -landroid +LOCAL_LDFLAGS := -u ANativeActivity_onCreate include $(BUILD_SHARED_LIBRARY) $(call import-module,android/native_app_glue) diff --git a/common/android_util.cpp b/common/android_util.cpp index 1480f44b..664bcd0f 100644 --- a/common/android_util.cpp +++ b/common/android_util.cpp @@ -22,6 +22,7 @@ #include <vector> #include <string> #include <sstream> +#include <stdlib.h> extern "C" { diff --git a/demos/android/jni/Android.mk b/demos/android/jni/Android.mk index 3e4169b2..839daccd 100644 --- a/demos/android/jni/Android.mk +++ b/demos/android/jni/Android.mk @@ -29,6 +29,7 @@ LOCAL_C_INCLUDES += $(SRC_DIR)/include \ LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/common/vulkan_wrapper.h LOCAL_WHOLE_STATIC_LIBRARIES += android_native_app_glue LOCAL_LDLIBS := -llog -landroid +LOCAL_LDFLAGS := -u ANativeActivity_onCreate include $(BUILD_SHARED_LIBRARY) $(call import-module,android/native_app_glue) diff --git a/demos/cube.c b/demos/cube.c index 56b9f37a..3d79b0e9 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -4131,8 +4131,6 @@ static void processCommand(struct android_app* app, int32_t cmd) { void android_main(struct android_app *app) { - app_dummy(); - #ifdef ANDROID int vulkanSupport = InitVulkan(); if (vulkanSupport == 0) diff --git a/demos/smoke/ShellAndroid.cpp b/demos/smoke/ShellAndroid.cpp index 2d9d0658..c7321a7c 100644 --- a/demos/smoke/ShellAndroid.cpp +++ b/demos/smoke/ShellAndroid.cpp @@ -112,7 +112,6 @@ ShellAndroid::ShellAndroid(android_app &app, Game &game) : Shell(game), app_(app instance_extensions_.push_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME); - app_dummy(); app_.userData = this; app_.onAppCmd = on_app_cmd; app_.onInputEvent = on_input_event; diff --git a/demos/smoke/android/CMakeLists.txt b/demos/smoke/android/CMakeLists.txt index 8846bce3..798089da 100644 --- a/demos/smoke/android/CMakeLists.txt +++ b/demos/smoke/android/CMakeLists.txt @@ -32,6 +32,11 @@ set(CMAKE_CXX_FLAGS -Wextra -Wno-unused-parameter \ -DVK_NO_PROTOTYPES -DVK_USE_PLATFORM_ANDROID_KHR \ -DGLM_FORCE_RADIANS") + +# Force export ANativeActivity_onCreate(), +# Refer to: https://github.com/android-ndk/ndk/issues/381. +set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate") + add_library(Smoke SHARED ${smokeDir}/Game.cpp ${smokeDir}/Meshes.cpp |