Revert "Convert BuildIgnoreApexContritbutions variable to a boolean"
This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/53721efb-c49e-4ce8-b96c-fd03598b4202).
Change-Id: Ifb82b8ec92b3ba8ad5da63ba497e4daad8093e4b
diff --git a/core/product.mk b/core/product.mk
index 39c3505..d64dde2 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -457,7 +457,7 @@
_product_single_value_vars += PRODUCT_BUILD_FROM_SOURCE_STUB
-_product_single_value_vars += PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS
+_product_list_vars += PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS
_product_single_value_vars += PRODUCT_HIDDEN_API_EXPORTABLE_STUBS
diff --git a/core/product_config.mk b/core/product_config.mk
index 2ed292c..4525423 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -301,23 +301,6 @@
PRODUCT_INCLUDE_TAGS += com.android.mainline mainline_module_prebuilt_nightly
endif
-# AOSP and Google products currently share the same `apex_contributions` in next.
-# This causes issues when building <aosp_product>-next-userdebug in main.
-# Create a temporary allowlist to ignore the google apexes listed in `contents` of apex_contributions of `next`
-# *for aosp products*.
-# TODO(b/308187268): Remove this denylist mechanism
-# Use PRODUCT_PACKAGES to determine if this is an aosp product. aosp products do not use google signed apexes.
-ignore_apex_contributions :=
-ifeq (,$(findstring com.google.android.conscrypt,$(PRODUCT_PACKAGES)))
- ignore_apex_contributions := true
-endif
-ifeq (true,$(PRODUCT_MODULE_BUILD_FROM_SOURCE))
- ignore_apex_contributions := true
-endif
-ifeq (true, $(ignore_apex_contributions))
-PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS := true
-endif
-
#############################################################################
# Quick check and assign default values
diff --git a/core/soong_config.mk b/core/soong_config.mk
index 3987f66..d4c56e5 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -335,7 +335,7 @@
$(call add_json_bool, CheckVendorSeappViolations, $(filter true,$(CHECK_VENDOR_SEAPP_VIOLATIONS)))
-$(call add_json_bool, BuildIgnoreApexContributionContents, $(PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS))
+$(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)))