diff options
| author | Mike Stroyan <stroyan@google.com> | 2016-09-27 10:43:13 -0600 |
|---|---|---|
| committer | Mike Stroyan <stroyan@google.com> | 2016-10-03 16:35:21 -0600 |
| commit | 779b93a24bbdeb6d0779c52cdd09cc91c775f312 (patch) | |
| tree | 04b3b390030a2e6cfca5edf5c3d86c10eeac46a8 | |
| parent | 3b37475915559b963e2b3a79de36224786a2df9b (diff) | |
| download | usermoji-779b93a24bbdeb6d0779c52cdd09cc91c775f312.tar.xz | |
build: make android layers favor their own symbols
Use -Bsymbolic linking android layers so they don't get symbols
like vkCreateDebugReportCallbackEXT from outside the layer.
| -rw-r--r-- | build-android/jni/Android.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk index d88fe55f..363b80ed 100644 --- a/build-android/jni/Android.mk +++ b/build-android/jni/Android.mk @@ -43,6 +43,7 @@ LOCAL_C_INCLUDES += $(SRC_DIR)/include \ LOCAL_STATIC_LIBRARIES += layer_utils SPIRV-Tools-prebuilt LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR LOCAL_LDLIBS := -llog +LOCAL_LDFLAGS += -Wl,-Bsymbolic include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -56,6 +57,7 @@ LOCAL_C_INCLUDES += $(SRC_DIR)/include \ LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR LOCAL_LDLIBS := -llog +LOCAL_LDFLAGS += -Wl,-Bsymbolic include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -69,6 +71,7 @@ LOCAL_C_INCLUDES += $(SRC_DIR)/include \ LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR LOCAL_LDLIBS := -llog +LOCAL_LDFLAGS += -Wl,-Bsymbolic include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -82,6 +85,7 @@ LOCAL_C_INCLUDES += $(SRC_DIR)/include \ LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR LOCAL_LDLIBS := -llog +LOCAL_LDFLAGS += -Wl,-Bsymbolic include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -95,6 +99,7 @@ LOCAL_C_INCLUDES += $(SRC_DIR)/include \ LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR LOCAL_LDLIBS := -llog +LOCAL_LDFLAGS += -Wl,-Bsymbolic include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -109,6 +114,7 @@ LOCAL_C_INCLUDES += $(SRC_DIR)/include \ LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR LOCAL_LDLIBS := -llog +LOCAL_LDFLAGS += -Wl,-Bsymbolic include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -122,6 +128,7 @@ LOCAL_C_INCLUDES += $(SRC_DIR)/include \ LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR LOCAL_LDLIBS := -llog +LOCAL_LDFLAGS += -Wl,-Bsymbolic include $(BUILD_SHARED_LIBRARY) # Pull in prebuilt shaderc @@ -183,6 +190,7 @@ LOCAL_STATIC_LIBRARIES := googletest_main layer_utils LOCAL_SHARED_LIBRARIES += shaderc-prebuilt glslang-prebuilt OGLCompiler-prebuilt OSDependent-prebuilt HLSL-prebuilt shaderc_util-prebuilt SPIRV-prebuilt SPIRV-Tools-prebuilt LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/common/vulkan_wrapper.h LOCAL_LDLIBS := -llog +LOCAL_LDFLAGS += -Wl,-Bsymbolic include $(BUILD_EXECUTABLE) # Note: The following module is similar in name to the executable, but differs so that loader won't enumerate the resulting .so |