commit 6ed83917db2e012e0cf4b9e0c08a72d7478f7c4f
author Dimitry Ivanov <dimitry@google.com> Tue Mar 10 16:56:42 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 10 16:56:42 2015 +0000
tree 4b4ff8d4d71e7778db0066c320c17657730f1ddb
parent e9911232dc634c68cbfa6388d5b879515a0b6908
parent 68349b916d5eb6bc12fed7a4c48f89bcc31f4640

am b27bd948: Merge "Generate gnu hash for arm only"

* commit 'b27bd94896dcfd94940e65a2438dc6a337c03038':
  Generate gnu hash for arm only

liblog/Android.mk

diff --git a/liblog/Android.mk b/liblog/Android.mk
index 89fca44..d7766f5 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 := -Wl,--hash-style=both
+LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
 
 include $(BUILD_SHARED_LIBRARY)