commit 64d3f78ee5d9dabf7df6106241dfae3334b34714
author Ken Wakasa <kwakasa@google.com> Mon Nov 17 18:29:13 2014 +0900
committer Ken Wakasa <kwakasa@google.com> Mon Nov 17 18:29:13 2014 +0900
tree 46d14156ac3b554e145fd88a81966877dc66b216
parent e7a72de8c28662e7a7855528d80c6a22a15fbcde

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

Looks like unbundled builds need to use --hash-style=sysv for the
sake of compatibility

Change-Id: Ia7b3a1cc3b2c91a8628551888a74925926dff855

native/jni/Android.mk

diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index 6003a6f..402cb3b 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -92,6 +92,9 @@
 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