summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitry Ivanov <dimitry@google.com>2015-03-10 17:34:25 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-10 17:34:26 +0000
commit810c47dc9589fe3d550987584c7f3366ecd90d8e (patch)
tree345c0b732a9f8c67753fe904ecc08d300be44a88
parent1f4602a3f5f907c76e9fada543ebd796145ebb21 (diff)
parent208a1c6b5d3458f1c6ef1b2c0d0ade1a82587d7a (diff)
downloadandroid_external_zlib-810c47dc9589fe3d550987584c7f3366ecd90d8e.tar.gz
android_external_zlib-810c47dc9589fe3d550987584c7f3366ecd90d8e.tar.bz2
android_external_zlib-810c47dc9589fe3d550987584c7f3366ecd90d8e.zip
Merge "Generate gnu hash for arm only"
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index a537484..c8cf0b1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,7 +27,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS += -O3 -DUSE_MMAP
# 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 := $(zlib_files)
ifneq ($(TARGET_BUILD_APPS),)