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

Commit d1aa8af7 authored Feb 15, 2024 by Spandan Das Committed by Automerger Merge Worker Feb 15, 2024

Merge "Create a product variable for skipping apex contribution contents" into main am: 6d7a094d

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

Change-Id: I1bcf3d60d59540547c6f450c7b351857f6360d97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents e0101ed3 6d7a094d

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)))