aboutsummaryrefslogtreecommitdiff
path: root/build-android
diff options
context:
space:
mode:
authorCody Northrop <cnorthrop@google.com>2017-08-16 13:25:22 -0600
committerCody Northrop <cnorthrop@google.com>2017-08-16 14:13:27 -0600
commit74013d2e4f471df7ffa95460eb509f4220653378 (patch)
treec861eaeec489e191af0fa6560502caa5bc9e4c83 /build-android
parent017981f812a92665e26763f5160ba5a72a440172 (diff)
downloadusermoji-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
Diffstat (limited to 'build-android')
-rw-r--r--build-android/jni/Android.mk1
1 files changed, 1 insertions, 0 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)