summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-12-05 05:57:01 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-05 05:57:01 +0000
commitaf9c6d3cf684f1cbecd25c9899f4f9c8fa7f9e4f (patch)
tree86df3666fcdf01083029675e4f6b40d50e8919fe
parent5d6fba8ef87ba56b9deef6892fe761dd45a8e2a6 (diff)
parent95dcfbd56b5384b356056521872a460885a9749a (diff)
downloadzlib-af9c6d3cf684f1cbecd25c9899f4f9c8fa7f9e4f.tar.gz
Merge "Prevent libz from providing stubs for vendor/product modules" into main am: 95dcfbd56b
Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2853111 Change-Id: Idba8f77d32718d64e59eff9804009e9f8f748fec 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 {