commit b5228ac07621a26ef5717ee5dcf74ecc9e3e1f68
author Dmitriy Ivanov <dimitry@google.com> Fri May 08 14:03:19 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Fri May 08 14:18:38 2015 -0700
tree ac925fce1659f10daf7fa06c00067bf663b0c1d2
parent e48f44f55b5cdb9c4c3fa6ae6eae56768c6b12af

Switch libjnigraphics.so to hash-style=both

Bug: http://b/19059885
Change-Id: I15f70b434b1d450e5b62ca7c204c628e2dc9edcc
(cherry picked from commit 2e84bc6948bb24ec67bf289ee1d0ed937a0fd4ff)

native/graphics/jni/Android.mk

diff --git a/native/graphics/jni/Android.mk b/native/graphics/jni/Android.mk
index f89a5af..1b684bb 100644
--- a/native/graphics/jni/Android.mk
+++ b/native/graphics/jni/Android.mk
@@ -32,7 +32,7 @@
 LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
 
 # 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
 
 include $(BUILD_SHARED_LIBRARY)