Merge "Follow up to https://android-review.googlesource.com/114561"

2014-11-17 10:05:33 +00:00 · 2014-11-17 10:05:33 +00:00 · 1a8ae0549d
parent 76f47ee433 64d3f78ee5
commit 1a8ae0549d
1 changed files with 3 additions and 0 deletions
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@ -92,6 +92,9 @@ LOCAL_SDK_VERSION := 14
 LOCAL_NDK_STL_VARIANT := c++_static
 LOCAL_LDFLAGS += -ldl

+# TODO: Figure out what we should do with --hash-style=gnu for unbundled builds
+LOCAL_LDFLAGS += -Wl,--hash-style=sysv
+
 include $(BUILD_SHARED_LIBRARY)
 #################### Clean up the tmp vars
 include $(LOCAL_PATH)/CleanupNativeFileList.mk