Merge "Mark libz available to the runtime apex." into main
diff --git a/Android.bp b/Android.bp
index 31358e8..a2133aa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -179,7 +179,7 @@
name: "libz",
defaults: ["libz_defaults"],
- whole_static_libs: ["libz_static"],
+ srcs: libz_srcs,
unique_host_soname: true,
static_ndk_lib: true,
@@ -217,24 +217,6 @@
afdo: true,
}
-cc_library {
- name: "libz_static",
- defaults: ["libz_defaults"],
- visibility: ["//visibility:private"],
-
- srcs: libz_srcs,
-
- sdk_version: "minimum",
- min_sdk_version: "apex_inherit",
-
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- "com.android.runtime",
- "//apex_available:platform",
- ],
-}
-
// A build of libz with identical behavior between architectures.
// Used by legacy OTA tools such as imgdiff and updater and their tests.
// New code should not use this library, because new code should not make
@@ -355,9 +337,6 @@
symbol_file: "libz.map.txt",
first_version: "9",
unversioned_until: "current",
- export_header_libs: [
- "libz_headers",
- ],
}
// Export zlib headers for inclusion in the musl sysroot.
