summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitriy Ivanov <dimitry@google.com>2015-03-09 18:32:59 -0700
committerDimitry Ivanov <dimitry@google.com>2015-03-10 02:40:34 +0000
commit318f729ac071bc81263a08730c18711e6b37d024 (patch)
tree4f19299eb524e39ce36a4fd1ab81dd0ef1d6bd7b
parent79547e027abdfb4b2106f136ade2b6fd5f9b12d2 (diff)
downloadandroid_external_zlib-318f729ac071bc81263a08730c18711e6b37d024.tar.gz
android_external_zlib-318f729ac071bc81263a08730c18711e6b37d024.tar.bz2
android_external_zlib-318f729ac071bc81263a08730c18711e6b37d024.zip
Generate sysv hash for libz
Bug: 19059885 Change-Id: I3f3f54311bcbd388e2a11cda3d38c1a5c5e4e92f
-rw-r--r--Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 6b79033..7bd19d9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,6 +25,10 @@ zlib_files := \
LOCAL_MODULE := libz
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_SRC_FILES := $(zlib_files)
ifeq ($(TARGET_ARCH),arm)
LOCAL_SDK_VERSION := 9