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

Commit e49850bf authored Jan 21, 2025 by Cole Faust Committed by Automerger Merge Worker Jan 21, 2025

Merge "Add PRODUCT_SOONG_ONLY" into main am: a41075ec

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

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

parents ccd79658 a41075ec

core/product.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -501,6 +501,9 @@ _product_single_value_vars += PRODUCT_IGNORE_ALL_ANDROIDMK
		_product_list_vars += PRODUCT_ALLOWED_ANDROIDMK_FILES
		# When PRODUCT_IGNORE_ALL_ANDROIDMK is set to true, path of file that contains a list of allowed Android.mk files
		_product_single_value_vars += PRODUCT_ANDROIDMK_ALLOWLIST_FILE
		# Setting PRODUCT_SOONG_ONLY will cause the build to default to --soong-only mode, and the main
		# kati invocation will not be run.
		_product_single_value_vars += PRODUCT_SOONG_ONLY

		.KATI_READONLY := _product_single_value_vars _product_list_vars
		_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)

core/product_config.mk

+8 −0

Original line number	Diff line number	Diff line
		@@ -699,4 +699,12 @@ $(foreach image, \

		product-build-image-config :=

		ifdef PRODUCT_SOONG_ONLY
		ifneq ($(PRODUCT_SOONG_ONLY),true)
		ifneq ($(PRODUCT_SOONG_ONLY),false)
		$(error PRODUCT_SOONG_ONLY can only be true, false or unset)
		endif
		endif
		endif

		$(call readonly-product-vars)