Revert "Set apex_available property" am: 69a32df22a am: 6c352ab9a1

Change-Id: Ib7d39c3f12b6084af91bdb5446b06c0888834790

1 files changed, 6 insertions, 14 deletions

diff --git a/Android.bp b/Android.bp
index 998c6b0..c665c49 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",