summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-12-05 06:54:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-05 06:54:48 +0000
commitaebc3b9baa4de1077265ea4d0f057f81d2e62b96 (patch)
tree86df3666fcdf01083029675e4f6b40d50e8919fe
parent4c219e016029767f2a6046fc0d7a8d02f9407ba0 (diff)
parent650d1bba036c7000b492afaa6d1efcbdebfe083f (diff)
downloadzlib-aebc3b9baa4de1077265ea4d0f057f81d2e62b96.tar.gz
Merge "Prevent libz from providing stubs for vendor/product modules" into main am: 95dcfbd56b am: af9c6d3cf6 am: 650d1bba03
Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2853111 Change-Id: I21b3bc1d695c271145a88cf130229744662ffc75 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp12
1 files changed, 12 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 78b0d56..2eb3d13 100644
--- a/Android.bp
+++ b/Android.bp
@@ -185,6 +185,18 @@ cc_library {
],
symbol_file: "libz.map.txt",
},
+
+ // When used by Vendor/Product APEX,
+ // libz should be treated like non-stable module.
+ // (Hence, should be bundled in APEX).
+ target: {
+ product: {
+ no_stubs: true,
+ },
+ vendor: {
+ no_stubs: true,
+ },
+ }
}
cc_library {