diff options
author | Jiyong Park <jiyong@google.com> | 2020-05-29 02:13:49 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-29 02:13:49 +0000 |
commit | 6f4c43260c44f347a44ab240299150851a409d8f (patch) | |
tree | d141303ac2d0de4e3c5c7de0e0dbdcdce54421fb | |
parent | 06ffb8a9b02a5972d47b38e0e49794cf9a104777 (diff) | |
parent | 83fda04e5ad89925b4018d3e658ca8f41e7adac3 (diff) | |
download | zlib-android11-mainline-documentsui-release.tar.gz |
Merge "Reland "Set apex_available property"" into rvc-dev am: 83fda04e5aandroid-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-release
Change-Id: If606168cd0065bb020ced2d063af769d205cd0f8
-rw-r--r-- | Android.bp | 21 |
1 files changed, 15 insertions, 6 deletions
@@ -87,12 +87,6 @@ cc_library { ], } -cc_library_static { - name: "libz_current", - defaults: ["libz_defaults"], - sdk_version: "current", -} - cc_binary_host { name: "minigzip", srcs: ["contrib/minigzip/minigzip.c"], @@ -129,6 +123,21 @@ cc_binary { // license: "NOTICE", // } +// TODO(b/155351357) remove this library and let libtextclassifier to use libz +// instead. +// libz_current allows modules building against the NDK to have access to zlib +// API that's not available from the NDK libz. +cc_library_static { + name: "libz_current", + defaults: ["libz_defaults"], + sdk_version: "current", + + apex_available: [ + "//apex_available:platform", // indirectly from GoogleExtServices that gets installed to /system + "com.android.extservices", // indirectly via libtextclassifier + ], +} + ndk_library { name: "libz", symbol_file: "libz.map.txt", |