commit 40ed4f5d5ea0f9fa38ecbaa5fed7163b72e90063
author Dimitry Ivanov <dimitry@google.com> Wed Mar 11 20:08:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 11 20:08:56 2015 +0000
tree c7b45718bc7aeba11383c8d0fa5ef8f2f2b13c28
parent 17e8158635e520e28e6068a9b441e18deafc2d3d
parent 44ad0f9b1f1f06f4db58f985c847f455c3b02e3c

am 44ad0f9b: am ddd97caf: am b27bd948: Merge "Generate gnu hash for arm only"

* commit '44ad0f9b1f1f06f4db58f985c847f455c3b02e3c':
  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)