commit a15adad27b1a33de2f4c788809ba97cff726cf58
author Dmitriy Ivanov <dimitry@google.com> Fri May 08 14:15:44 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Fri May 08 14:41:42 2015 -0700
tree 345c0b732a9f8c67753fe904ecc08d300be44a88
parent 0bb150b636a7055cf759e7fcd0d8314d71487170

Switch libz.so to hash-style=both

Bug: http://b/19059885
Change-Id: Ia0ae87217720fb1c6b334af3548545b143054c89
(cherry picked from commit 9630d2db3b117d88e08c33a8c32ff7b7a8bab2f0)

Android.mk

diff --git a/Android.mk b/Android.mk
index b0e4b63..c8cf0b1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,7 +27,7 @@
 LOCAL_CFLAGS += -O3 -DUSE_MMAP
 
 # TODO: This is to work around b/19059885. Remove after root cause is fixed
-LOCAL_LDFLAGS_arm := -Wl,--hash-style=sysv
+LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
 
 LOCAL_SRC_FILES := $(zlib_files)
 ifneq ($(TARGET_BUILD_APPS),)