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

Commit e172809f authored Feb 03, 2025 by Wei Li Committed by Automerger Merge Worker Feb 03, 2025

Merge "Add PRODUCT_USE_SOONG_NOTICE_XML to control switching to NOTICE.xml.gz...

Merge "Add PRODUCT_USE_SOONG_NOTICE_XML to control switching to NOTICE.xml.gz generated by Soong" into main am: c2c09d7a am: d3453243

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

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

parents dde70538 d3453243

core/product.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -505,6 +505,9 @@ _product_single_value_vars += PRODUCT_ANDROIDMK_ALLOWLIST_FILE
		# kati invocation will not be run.
		_product_single_value_vars += PRODUCT_SOONG_ONLY

		# If set to true, use NOTICE.xml.gz generated by soong
		_product_single_value_vars += PRODUCT_USE_SOONG_NOTICE_XML

		.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
		@@ -255,6 +255,8 @@ $(call add_json_list, TargetFSConfigGen, $(TARGET_FS_CONFIG_GEN)
		$(call add_json_bool, UseSoongSystemImage, $(filter true,$(USE_SOONG_DEFINED_SYSTEM_IMAGE)))
		$(call add_json_str, ProductSoongDefinedSystemImage, $(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE))

		$(call add_json_bool, UseSoongNoticeXML, $(filter true,$(PRODUCT_USE_SOONG_NOTICE_XML)))

		$(call add_json_map, VendorVars)
		$(foreach namespace,$(sort $(SOONG_CONFIG_NAMESPACES)),\
		$(call add_json_map, $(namespace))\