From fb3ce3331a4c45a1f02ff4477640d38196370180 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Wed, 14 Feb 2024 02:18:34 +0000 Subject: [PATCH] Create a product variable for skipping apex contribution contents This denylist will be used to ignore the prebuilt google apexes listed in apex_contributions of vendor/google/build when building aosp products in next. Test: in main, lunch aosp_cf_x86_64_phone-next-userdebug && m nothing (with ag/25842580) Bug: 308187268 Change-Id: I5330b44caf15193a00f1e255cef24b67c794382b --- core/product.mk | 2 ++ core/soong_config.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/core/product.mk b/core/product.mk index 2d22ebf7a7..4250253465 100644 --- a/core/product.mk +++ b/core/product.mk @@ -454,6 +454,8 @@ _product_list_vars += PRODUCT_VALIDATION_CHECKS _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 575bb38d1f..ec0c70eb6f 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -335,6 +335,8 @@ $(call add_json_bool, KeepVndk, $(filter true,$(KEEP_VNDK))) $(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)))