diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-03-13 21:04:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-13 21:04:08 +0000 |
| commit | d7e091efc477c17da97415fa944675c6f16dcdb5 (patch) | |
| tree | 904c8fac8e099244d92cf0dfb495d6a95335e1b9 | |
| parent | f074b531d266deb63c17e1d3bff751f3f3740d9d (diff) | |
| parent | 2e16d2cf1e477af1db92efde389a5ce0a8e6fbb3 (diff) | |
| download | android_bionic-d7e091efc477c17da97415fa944675c6f16dcdb5.tar.gz android_bionic-d7e091efc477c17da97415fa944675c6f16dcdb5.tar.bz2 android_bionic-d7e091efc477c17da97415fa944675c6f16dcdb5.zip | |
Merge "Switch libc and libm to sysv-only hash style"
| -rw-r--r-- | libc/Android.mk | 2 | ||||
| -rw-r--r-- | libm/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 293b70e07..7bbdd9901 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -1326,7 +1326,7 @@ LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CPPFLAGS := $(libc_common_cppflags) # TODO: This is to work around b/19059885. Remove after root cause is fixed -LOCAL_LDFLAGS_arm := -Wl,--hash-style=both +LOCAL_LDFLAGS_arm := -Wl,--hash-style=sysv LOCAL_C_INCLUDES := $(libc_common_c_includes) LOCAL_SRC_FILES := \ diff --git a/libm/Android.mk b/libm/Android.mk index 529dda858..6472a1542 100644 --- a/libm/Android.mk +++ b/libm/Android.mk @@ -514,7 +514,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) # TODO: This is to work around b/19059885. Remove after root cause is fixed -LOCAL_LDFLAGS_arm := -Wl,--hash-style=both +LOCAL_LDFLAGS_arm := -Wl,--hash-style=sysv LOCAL_MODULE := libm LOCAL_CLANG := $(libm_clang) |