diff options
author | Dan Willemsen <dwillemsen@google.com> | 2017-09-29 10:07:47 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-29 10:07:47 +0000 |
commit | 6a078b757ab87e6ccbb36ba55f2d48615309cff9 (patch) | |
tree | 116503a146fffede408aa8a6f11c329c0aaae199 | |
parent | d8dbf163c661ed4fb796dcb4c7756a1ef90536a4 (diff) | |
parent | cb584e1431dade580df3b16f32610a51b1c21cfe (diff) | |
download | android_external_curl-6a078b757ab87e6ccbb36ba55f2d48615309cff9.tar.gz android_external_curl-6a078b757ab87e6ccbb36ba55f2d48615309cff9.tar.bz2 android_external_curl-6a078b757ab87e6ccbb36ba55f2d48615309cff9.zip |
Merge "Rename libz-host -> libz" am: 98b0d14797 am: d8a68223b1 am: 8e1f2377e3
am: cb584e1431
Change-Id: I154af8bca344b264bda409a56c87f30b56cdbd52
-rw-r--r-- | Android.bp | 33 |
1 files changed, 5 insertions, 28 deletions
@@ -188,37 +188,14 @@ cc_library { "lib/vtls/gskit.c", "lib/vtls/mbedtls.c", ], - shared: { - shared_libs: [ - "libcrypto", - "libssl", - ], - }, - static: { - static_libs: [ - "libcrypto", - "libssl", - "libz", - ], - }, + shared_libs: [ + "libcrypto", + "libssl", + "libz", + ], target: { host: { cflags: ["-D_GNU_SOURCE=1"], - shared: { - shared_libs: [ - "libz-host", - ], - }, - }, - linux: { - host_ldlibs: ["-lrt"], - }, - android: { - shared: { - shared_libs: [ - "libz", - ], - }, }, }, unique_host_soname: true, |