commit | fc811967411dece7ce21c58457998f6c513590a7 | [log] [tgz] |
---|---|---|
author | Ken Wakasa <kwakasa@google.com> | Mon Nov 17 22:18:03 2014 +0000 |
committer | Ken Wakasa <kwakasa@google.com> | Mon Nov 17 22:18:03 2014 +0000 |
tree | ca5f5758ed63ef4ba1a8b36417e6b16db103ba3d | |
parent | 64d3f78ee5d9dabf7df6106241dfae3334b34714 [diff] |
Revert "Follow up to https://android-review.googlesource.com/114561" This reverts commit 64d3f78ee5d9dabf7df6106241dfae3334b34714 per https://android-review.googlesource.com/114664 Change-Id: I2acab828d41e79847db72f8d2677c12173a323b6
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 402cb3b..6003a6f 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk
@@ -92,9 +92,6 @@ 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