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

Commit 7416360c authored by Spandan Das's avatar Spandan Das Committed by Gerrit Code Review
Browse files

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

Revert submission 2966055-revert-2964509-skip-apex-contributions-EOKWOFHENC

Reason for revert: The root cause CL has been reverted https://googleplex-android-review.git.corp.google.com/c/platform/vendor/google/build/+/26268799

Reverted changes: /q/submissionid:2966055-revert-2964509-skip-apex-contributions-EOKWOFHENC

Change-Id: I9a40b652d38f1a4a4693e0cdb66cbe48632bafff
parent 8804a8e2

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
@@ -334,6 +334,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)))