diff options
author | Jiyong Park <jiyong@google.com> | 2020-05-19 03:33:34 +0000 |
---|---|---|
committer | Jiyong Park <jiyong@google.com> | 2020-05-19 03:33:34 +0000 |
commit | 69a32df22aab9e05dc8553f52c2da28c6b9f3e2c (patch) | |
tree | 8a76c4aa7580eac05b772b3d978fbe3d174e5931 | |
parent | 912db88c1d89d011f68e9c4091e7f11382842836 (diff) | |
download | zlib-69a32df22aab9e05dc8553f52c2da28c6b9f3e2c.tar.gz |
Revert "Set apex_available property"
This reverts commit 912db88c1d89d011f68e9c4091e7f11382842836.
Reason for revert: broke adt3
Change-Id: Ie98bde22004de9e6893d61f18feedeeb4935a58a
-rw-r--r-- | Android.bp | 20 |
1 files changed, 6 insertions, 14 deletions
@@ -73,6 +73,12 @@ cc_library { }, } +cc_library_static { + name: "libz_current", + defaults: ["libz_defaults"], + sdk_version: "current", +} + cc_binary_host { name: "minigzip", srcs: ["contrib/minigzip/minigzip.c"], @@ -109,20 +115,6 @@ 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: [ - "com.android.extservices", // indirectly via libtextclassifier - ], -} - ndk_library { name: "libz", symbol_file: "libz.map.txt", |