commit 1156508265422f407c7072788ce6c32c35411941
author Goran Jakovljevic <goran.jakovljevic@imgtec.com> Tue Mar 10 17:11:39 2015 +0100
committer Dmitriy Ivanov <dimitry@google.com> Tue Mar 10 10:01:50 2015 -0700
tree 8396de72d1b950b695df57fe39a679c9e37ff440
parent a94cf791c1c9b93d49f5573716de93348757ae15

Generate gnu hash for arm only

Fixes build failure caused by:
https://android-review.googlesource.com/#/c/139660

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: I9a7966eebfd1ef0a587a20b71faefde38e84ab62

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index d0ef772..293b70e 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1326,7 +1326,7 @@
 LOCAL_CPPFLAGS := $(libc_common_cppflags)
 
 # 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
 
 LOCAL_C_INCLUDES := $(libc_common_c_includes)
 LOCAL_SRC_FILES := \
@@ -1480,7 +1480,7 @@
 LOCAL_CPPFLAGS := $(libc_common_cppflags)
 
 # 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
 
 LOCAL_SRC_FILES := $(libstdcxx_common_src_files)
 LOCAL_MODULE:= libstdc++

libm/Android.mk

diff --git a/libm/Android.mk b/libm/Android.mk
index 092ebd5..2f30c82 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -439,7 +439,7 @@
 include $(CLEAR_VARS)
 
 # 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
 
 LOCAL_MODULE := libm
 LOCAL_CLANG := $(libm_clang)