commit c8c18517d8dbaaee6942f6c290c29ca024be29f1
author Dmitriy Ivanov <dimitry@google.com> Fri Mar 13 21:54:54 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 13 21:54:54 2015 +0000
tree 7a51a07ec99f51006f97e86ee74025eb582bc9cf
parent 23a8043aa8406cc8ef5663e839e67a6e1063fbe7
parent 2df117830c9b980dab271749a7e8938f8c9a022f

am 2f73d736: am 821b8570: Merge "Switch liblog to sysv-only hash style"

* commit '2f73d73640e8e8ee360ebd7f9fbbd85abae9df01':
  Switch liblog to sysv-only hash style

liblog/Android.mk

diff --git a/liblog/Android.mk b/liblog/Android.mk
index d7766f5..70aff83 100644
--- a/liblog/Android.mk
+++ b/liblog/Android.mk
@@ -85,7 +85,7 @@
 LOCAL_CFLAGS := -Werror $(liblog_cflags)
 
 # 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
 
 include $(BUILD_SHARED_LIBRARY)