summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2024-01-10 20:05:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-01-10 20:05:49 +0000
commitf0be4319d9ecfb0182f87a4ed1304b88c97569fc (patch)
treed43a404c43b27ccc1db611c31b4b4f041691101a
parent34ec596227b80cdd4bde162019178dbb3d8e3381 (diff)
parentcaa2e3aea169022330515d283f22fc6cf93fed5d (diff)
downloadzlib-f0be4319d9ecfb0182f87a4ed1304b88c97569fc.tar.gz
Merge "Allow libunwindstack to use libz_static." into main am: e39eef61c2 am: caa2e3aea1
Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2858390 Change-Id: I360906efbc4df2ca407feae1eb91ec61ec0dcd79 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp8
1 files changed, 7 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 1e40098..b4fdbc8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -202,13 +202,19 @@ cc_library {
cc_library {
name: "libz_static",
defaults: ["libz_defaults"],
- visibility: ["//external/angle"],
+ visibility: [
+ "//external/angle",
+ "//system/unwinding/libunwindstack",
+ ],
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",
],