Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 200c9588 authored by Spandan Das's avatar Spandan Das Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Create a product variable for skipping apex cont...""... 

Merge "Revert "Revert "Create a product variable for skipping apex cont..."" into main am: 9001b9af

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



Change-Id: Ic094fbd2adb507a5ac4da63ce282d341fc20250a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 839d2b46 9001b9af

core/product.mk

+2 −0
Original line number Diff line number Diff line
@@ -454,6 +454,8 @@ _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)

core/soong_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -335,6 +335,8 @@ $(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)))