summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitry Ivanov <dimitry@google.com>2015-03-11 20:08:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-11 20:08:56 +0000
commit40ed4f5d5ea0f9fa38ecbaa5fed7163b72e90063 (patch)
treec7b45718bc7aeba11383c8d0fa5ef8f2f2b13c28
parent17e8158635e520e28e6068a9b441e18deafc2d3d (diff)
parent44ad0f9b1f1f06f4db58f985c847f455c3b02e3c (diff)
downloadsystem_core-40ed4f5d5ea0f9fa38ecbaa5fed7163b72e90063.zip
system_core-40ed4f5d5ea0f9fa38ecbaa5fed7163b72e90063.tar.gz
system_core-40ed4f5d5ea0f9fa38ecbaa5fed7163b72e90063.tar.bz2
am 44ad0f9b: am ddd97caf: am b27bd948: Merge "Generate gnu hash for arm only"
* commit '44ad0f9b1f1f06f4db58f985c847f455c3b02e3c': Generate gnu hash for arm only
-rw-r--r--liblog/Android.mk2
1 files changed, 1 insertions, 1 deletions
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_WHOLE_STATIC_LIBRARIES := liblog
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)