commit e842dc0de5ce5f9950e323ae8805909f60867bf6
author Dimitry Ivanov <dimitry@google.com> Tue Mar 10 17:41:18 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 10 17:41:18 2015 +0000
tree 5d5d959f42cfe95617aeb39f2b3d8b9fefe0cd2a
parent dca2fadd8252a5c0664d2811187bc39bd7916aa4
parent c16c8368773452e2d18d761a7b3ea6f249dc2ac5

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

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

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)