commit 402d19945092eee87cfb6c029c98ccb4fb40d2c6
author Dmitriy Ivanov <dimitry@google.com> Fri Mar 27 15:27:07 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Fri Mar 27 15:27:07 2015 -0700
tree fed0256e34404fee5603fe4a862190a949f8c522
parent cd79a59b18f8e81b5f37258f376a726dc8acb81a

Fix libstdc++.so hash-style.

Bug: 19059885
Bug: 19958712
Change-Id: I167457a54cc688d64912a50f5fb75e4e2f3e3937

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index ebc59de..e438552 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1502,7 +1502,7 @@
 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_SRC_FILES := $(libstdcxx_common_src_files)
 LOCAL_MODULE:= libstdc++