summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2017-09-29 09:34:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-29 09:34:42 +0000
commitedb4f3367276b44d9fd5040856b7cf98f1b85bf1 (patch)
treed49c775aa0b6f2a0c8637d1b2129a4154c3eec02
parent92e352c36fe8b89ca73d8e9e671237a5fbf19dc7 (diff)
parent747aaf537384878ed9d8e216076d3ad18ff17635 (diff)
downloadmclinker-edb4f3367276b44d9fd5040856b7cf98f1b85bf1.tar.gz
Merge "Rename libz-host -> libz" am: f14c19b75c am: eb76075156
am: 747aaf5373 Change-Id: I83f9848f53e887b9df40fc21c815f0e656fbc7fe
-rw-r--r--tools/mcld/Android.bp5
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/mcld/Android.bp b/tools/mcld/Android.bp
index 297e646..739f076 100644
--- a/tools/mcld/Android.bp
+++ b/tools/mcld/Android.bp
@@ -49,17 +49,14 @@ cc_binary {
shared_libs: [
"libLLVM",
+ "libz",
],
target: {
host: {
- shared_libs: ["libz-host"],
static_libs: MCLD_ARM_LIBS + MCLD_AARCH64_LIBS +
MCLD_MIPS_LIBS + MCLD_X86_LIBS,
},
- android: {
- shared_libs: ["libz"],
- },
// Add target specific code generation libraries
android_arm: {