commit 8466afaa6d76070a7d39841c9c38a947b43c2348
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Apr 15 22:54:57 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 15 22:54:57 2024 +0000
tree 2b64afdae652a48ab77564b7393feda0b507a0cc
parent 725fe1bde42825a3a2a65cd3c401c5c3a93d7eb3
parent 8b1e29ae7e6303999473759f59d78940d658d7b4

Merge "Make output of MakeVbmeta consistent" into main am: 8b1e29ae7e

Original change: https://android-review.googlesource.com/c/platform/build/+/3042632

Change-Id: I096ec22871d97e2d38e230edc040f8ae9d860c53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/product.mk

diff --git a/core/product.mk b/core/product.mk
index 9752f32..11b3623 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -463,7 +463,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
 

core/product_config.mk

diff --git a/core/product_config.mk b/core/product_config.mk
index d16c38d..b9952b0 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))$(findstring com.google.android.go.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

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 3cffef2..6a6596f 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)))