diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-09-29 04:17:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-29 04:17:35 +0000 |
| commit | 8e1f2377e32514aba50df50f72578c38ce59d378 (patch) | |
| tree | 116503a146fffede408aa8a6f11c329c0aaae199 | |
| parent | d8cd022a1864f2f9c1bf0c02b868e7ec9d4b00d5 (diff) | |
| parent | d8a68223b1c4e6364984b86601e5d06af8a141f7 (diff) | |
| download | android_external_curl-8e1f2377e32514aba50df50f72578c38ce59d378.tar.gz android_external_curl-8e1f2377e32514aba50df50f72578c38ce59d378.tar.bz2 android_external_curl-8e1f2377e32514aba50df50f72578c38ce59d378.zip | |
Merge "Rename libz-host -> libz" am: 98b0d14797
am: d8a68223b1
Change-Id: I6a493a5b1de178f98405203cad2d6e4f52431ff5
| -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, |