StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2966055

Change-Id: Id31f9685f6edad909ae846280d4de18d1ac89121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-02-17 02:29:38 +00:00
committed by Automerger Merge Worker
parent b3d429a72f cdf6054f03
commit d11fb36b2c
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/product.mk
View File

@@ -454,8 +454,6 @@ _product_list_vars += PRODUCT_VALIDATION_CHECKS
_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)

2
core/soong_config.mk
View File

@@ -335,8 +335,6 @@ $(call add_json_bool, KeepVndk, $(filter true,$(KEEP_VNDK)))
$(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)))