diff options
| author | Ting-Hsin Chen <tinghsin@google.com> | 2024-03-22 06:20:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-22 06:20:17 +0000 |
| commit | d14e178b79f457f0d00becaea670f1f5f3991814 (patch) | |
| tree | d94255c2023ee1d9e5421cc2e32df0db6ad4885d | |
| parent | 4786d0ad3da420208a8d3c631ad71ab89f16b08b (diff) | |
| parent | c7220c48774145ab87ecd887de246d3255640281 (diff) | |
| download | build-d14e178b79f457f0d00becaea670f1f5f3991814.tar.gz | |
Merge "Revert "Convert BuildIgnoreApexContritbutions variable to a boolean"" into main
| -rw-r--r-- | core/product.mk | 2 | ||||
| -rw-r--r-- | core/product_config.mk | 17 | ||||
| -rw-r--r-- | core/soong_config.mk | 2 |
3 files changed, 2 insertions, 19 deletions
diff --git a/core/product.mk b/core/product.mk index 39c350571f..d64dde2c68 100644 --- a/core/product.mk +++ b/core/product.mk @@ -457,7 +457,7 @@ _product_list_vars += PRODUCT_VALIDATION_CHECKS _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 2ed292c18e..4525423b4f 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -301,23 +301,6 @@ ifeq (, $(PRODUCT_INCLUDE_TAGS)) 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 3987f66ce1..d4c56e5707 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -335,7 +335,7 @@ $(call add_json_bool, KeepVndk, $(filter true,$(KEEP_VNDK))) $(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))) |