diff options
| -rw-r--r-- | libc/Android.mk | 8 | ||||
| -rw-r--r-- | libm/Android.mk | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index cb1d8c0..d0ef772 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -1324,6 +1324,10 @@ include $(CLEAR_VARS) LOCAL_CFLAGS := $(libc_common_cflags) 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 := -Wl,--hash-style=both + LOCAL_C_INCLUDES := $(libc_common_c_includes) LOCAL_SRC_FILES := \ $(libc_arch_dynamic_src_files) \ @@ -1474,6 +1478,10 @@ include $(CLEAR_VARS) LOCAL_C_INCLUDES := $(libc_common_c_includes) bionic/libstdc++/include LOCAL_CFLAGS := $(libc_common_cflags) LOCAL_CPPFLAGS := $(libc_common_cppflags) + +# TODO: This is to work around b/19059885. Remove after root cause is fixed +LOCAL_LDFLAGS := -Wl,--hash-style=both + LOCAL_SRC_FILES := $(libstdcxx_common_src_files) LOCAL_MODULE:= libstdc++ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk diff --git a/libm/Android.mk b/libm/Android.mk index 418ec59..092ebd5 100644 --- a/libm/Android.mk +++ b/libm/Android.mk @@ -438,6 +438,9 @@ include $(BUILD_STATIC_LIBRARY) # ----------------------------------------------------------------------------- include $(CLEAR_VARS) +# TODO: This is to work around b/19059885. Remove after root cause is fixed +LOCAL_LDFLAGS := -Wl,--hash-style=both + LOCAL_MODULE := libm LOCAL_CLANG := $(libm_clang) LOCAL_SYSTEM_SHARED_LIBRARIES := libc |