diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-09-28 20:57:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-28 20:57:43 +0000 |
| commit | 98b0d14797cc42e32d18b289fbdc47dda1eaaeff (patch) | |
| tree | 116503a146fffede408aa8a6f11c329c0aaae199 | |
| parent | d157ac9fdb59d1aff35316625bc3a8486d767f44 (diff) | |
| parent | 9de5a545a801336965f9e64c0e89867c53b1885f (diff) | |
| download | android_external_curl-98b0d14797cc42e32d18b289fbdc47dda1eaaeff.tar.gz android_external_curl-98b0d14797cc42e32d18b289fbdc47dda1eaaeff.tar.bz2 android_external_curl-98b0d14797cc42e32d18b289fbdc47dda1eaaeff.zip | |
Merge "Rename libz-host -> libz"
| -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, |