commit 4a55c46d308deae70d7d8669c50514d521813dc2
author Dmitriy Ivanov <dimitry@google.com> Mon Mar 09 19:38:56 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Mon Mar 09 19:38:56 2015 -0700
tree 58d3ded6c3fe7002348e118f45435c668cfac5d8
parent 017f94d34eedfaca1c62cb35a65b8436f04b8f62

Generate sysv hash for libc, libstdc++ and libm

Bug: 19059885
Change-Id: I35e2a9cd0bb3914d9d0c82d163bfaf0fff844667

libc/Android.mk

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 @@
 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 @@
 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