summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Pedowitz <ijpedowitz@google.com>2018-01-19 05:05:38 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-01-19 05:05:38 +0000
commit2c9c51f114436bc69fa15376a3e06c777dc4e6ff (patch)
treefe3350a793a7c8e7db1605c891b23d22eb9a6859
parent8844b908c30cc6e194d0029fa02deba17a444a67 (diff)
parentc52053e718a05451f6530256af7b4d48e685d0ab (diff)
downloadzlib-2c9c51f114436bc69fa15376a3e06c777dc4e6ff.tar.gz
Merge "Fixing app compat issue b/72143978" am: 7bc4454186 am: 10b6406590
am: c52053e718 Change-Id: I9fe03a711cc63cd83daff561fc6f72280febd050
-rw-r--r--Android.bp3
1 files changed, 3 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 0bf8c96..7a4faf3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,6 +42,9 @@ cc_library {
// measurements show that the ARM version of ZLib is about x1.17 faster
// than the thumb one...
instruction_set: "arm",
+
+ // TODO: This is to work around b/24465209. Remove after root cause is fixed
+ ldflags: ["-Wl,--hash-style=both"],
},
},