diff options
author | Jiyong Park <jiyong@google.com> | 2020-05-29 02:26:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-29 02:26:12 +0000 |
commit | 1a9b432817192342bbfb5a389058a45eea9f816c (patch) | |
tree | d141303ac2d0de4e3c5c7de0e0dbdcdce54421fb | |
parent | df5028a4a777e9258fb3d326d1e05159aa632836 (diff) | |
parent | 7f4e3c2e0f582ba7739ac2d7501b5d8cbb14649c (diff) | |
download | zlib-1a9b432817192342bbfb5a389058a45eea9f816c.tar.gz |
Merge "Reland "Set apex_available property"" into rvc-dev am: 83fda04e5a am: 7f4e3c2e0fandroid-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-release
Change-Id: Ieaf6afc66393ea747566606419fe9a1da57e5851
-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", |