commit cdf6054f03a494287b76f688f1caed333070e821
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Feb 17 02:24:02 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 17 02:24:02 2024 +0000
tree e427917bd00525c68ff0b905f612719d0002e769
parent 18a2ebc4ab2269766d6efaabf5f584216ca94e23
parent 8804a8e2bd2a47b318a0041efbc6718934bbf8be

Merge "Revert "Create a product variable for skipping apex contribution..."" into main

core/product.mk

diff --git a/core/product.mk b/core/product.mk
index 4250253..2d22ebf 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -454,8 +454,6 @@
 
 _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)
 

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index ec0c70e..575bb38 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -335,8 +335,6 @@
 
 $(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)))