summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2018-05-23 14:28:24 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-05-23 14:28:24 -0700
commitcfb9143096d89fb53d4139945a9cfbf2fe5d834f (patch)
tree0c11ca38d6dddb627584b8c5bdc973dafce79c62
parent09366b9ebc9f95dbe9bc1b4f68677c76e0770ec6 (diff)
parent6f0b0285d898d8774bf9625a5390f7b15de7e43b (diff)
downloadzlib-cfb9143096d89fb53d4139945a9cfbf2fe5d834f.tar.gz
Merge "Work around b/24465209, do not use clang lld" am: 880f6e9942
am: 6f0b0285d8 Change-Id: I37ac79fd81449365a520e2e3254273941676ae1a
-rw-r--r--Android.bp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 952f037..d528a28 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,6 +47,7 @@ cc_library {
// TODO: This is to work around b/24465209. Remove after root cause is fixed
ldflags: ["-Wl,--hash-style=both"],
+ use_clang_lld: false,
},
},