Merge "Create a product variable for skipping apex contribution contents" into main am: 6d7a094dd0
Original change: https://android-review.googlesource.com/c/platform/build/+/2964509
Change-Id: I1bcf3d60d59540547c6f450c7b351857f6360d97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/product.mk b/core/product.mk
index 2d22ebf..4250253 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -454,6 +454,8 @@
_product_single_value_vars += PRODUCT_BUILD_FROM_SOURCE_STUB
+_product_list_vars += PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS
+
.KATI_READONLY := _product_single_value_vars _product_list_vars
_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)
diff --git a/core/soong_config.mk b/core/soong_config.mk
index 575bb38..ec0c70e 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -335,6 +335,8 @@
$(call add_json_bool, CheckVendorSeappViolations, $(filter true,$(CHECK_VENDOR_SEAPP_VIOLATIONS)))
+$(call add_json_list, BuildIgnoreApexContributionContents, $(sort $(PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS)))
+
$(call add_json_map, PartitionVarsForBazelMigrationOnlyDoNotUse)
$(call add_json_str, ProductDirectory, $(dir $(INTERNAL_PRODUCT)))