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

Commit d11fb36b authored Feb 17, 2024 by Treehugger Robot Committed by Automerger Merge Worker Feb 17, 2024

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

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

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>

parents b3d429a7 cdf6054f

core/product.mk

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -454,8 +454,6 @@ _product_list_vars += PRODUCT_VALIDATION_CHECKS

	_product_single_value_vars += PRODUCT_BUILD_FROM_SOURCE_STUB		_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		.KATI_READONLY := _product_single_value_vars _product_list_vars
	_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)		_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)

core/soong_config.mk

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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_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_map, PartitionVarsForBazelMigrationOnlyDoNotUse)
	$(call add_json_str, ProductDirectory, $(dir $(INTERNAL_PRODUCT)))		$(call add_json_str, ProductDirectory, $(dir $(INTERNAL_PRODUCT)))