summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGoran Jakovljevic <goran.jakovljevic@imgtec.com>2015-03-10 17:17:28 +0100
committerDmitriy Ivanov <dimitry@google.com>2015-03-10 09:47:23 -0700
commit3947d5da3f98cd462c77c272d51cf4c01d9fcc65 (patch)
tree3c483e1cc4f420ce59b7b6b6640cd5a12ca83a6e
parentad571cdd2ce8c85f92ed87e021c94569b24fc7c1 (diff)
downloadsystem_core-3947d5da3f98cd462c77c272d51cf4c01d9fcc65.zip
system_core-3947d5da3f98cd462c77c272d51cf4c01d9fcc65.tar.gz
system_core-3947d5da3f98cd462c77c272d51cf4c01d9fcc65.tar.bz2
Generate gnu hash for arm only
Fixes mips build failure caused by: https://android-review.googlesource.com/#/c/139580/ As previously discussed [1], MIPS does not support GNU-style ELF hashes. [1] https://android-review.googlesource.com/#/c/49282/2/tests/Android.mk Change-Id: I757fef1d47663da3e414f5771dfc580ea7aa3732
-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)