commit 8804a8e2bd2a47b318a0041efbc6718934bbf8be
author Jihoon Kang <jihoonkang@google.com> Fri Feb 16 23:25:06 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 16 23:25:08 2024 +0000
tree 2e9368ccbf5b17755810cd7c92175f0288ed369b
parent debf166cad4c1b25cb52d2b708bc4c46e4b1b5fc

Revert "Create a product variable for skipping apex contribution..."

Revert submission 2964509-skip-apex-contributions

Reason for revert: 325666427

Reverted changes: /q/submissionid:2964509-skip-apex-contributions

Change-Id: I0172bdf99adce7b0eef42161c79cc7c1fdf977eb

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 843b03c..7d03aa3 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -334,8 +334,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)))