summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGoran Jakovljevic <goran.jakovljevic@imgtec.com>2015-03-10 17:22:19 +0100
committerDmitriy Ivanov <dimitry@google.com>2015-03-10 09:54:13 -0700
commit208a1c6b5d3458f1c6ef1b2c0d0ade1a82587d7a (patch)
tree345c0b732a9f8c67753fe904ecc08d300be44a88
parent1f4602a3f5f907c76e9fada543ebd796145ebb21 (diff)
downloadandroid_external_zlib-208a1c6b5d3458f1c6ef1b2c0d0ade1a82587d7a.tar.gz
android_external_zlib-208a1c6b5d3458f1c6ef1b2c0d0ade1a82587d7a.tar.bz2
android_external_zlib-208a1c6b5d3458f1c6ef1b2c0d0ade1a82587d7a.zip
Generate gnu hash for arm only
Fixes build failure caused by: https://android-review.googlesource.com/#/c/139620/ 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: I181ca29fd7af1bea5bc12f92e84cdee7fb253780
-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),)