From 2e16d2cf1e477af1db92efde389a5ce0a8e6fbb3 Mon Sep 17 00:00:00 2001 From: Dmitriy Ivanov Date: Fri, 13 Mar 2015 12:43:30 -0700 Subject: [PATCH] Switch libc and libm to sysv-only hash style Bug: 19059885 Change-Id: I60a23dc5f9c756994d566818332ca42b305b4a05 --- libc/Android.mk | 2 +- 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 2f30c8210..c7b777d56 100644 --- a/libm/Android.mk +++ b/libm/Android.mk @@ -439,7 +439,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)