am 9ef17c4b: Merge "Revert "Follow up to https://android-review.googlesource.com/114561""
* commit '9ef17c4b5a706de802c35bbce7d568ef203a6ac9': Revert "Follow up to https://android-review.googlesource.com/114561"main
commit
110b37eeaf
|
@ -92,9 +92,6 @@ LOCAL_SDK_VERSION := 14
|
||||||
LOCAL_NDK_STL_VARIANT := c++_static
|
LOCAL_NDK_STL_VARIANT := c++_static
|
||||||
LOCAL_LDFLAGS += -ldl
|
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)
|
include $(BUILD_SHARED_LIBRARY)
|
||||||
#################### Clean up the tmp vars
|
#################### Clean up the tmp vars
|
||||||
include $(LOCAL_PATH)/CleanupNativeFileList.mk
|
include $(LOCAL_PATH)/CleanupNativeFileList.mk
|
||||||
|
|
Loading…
Reference in New Issue