Add PRODUCT_USE_SOONG_NOTICE_XML to control switching to NOTICE.xml.gz generated by Soong
Bug: 330949782
Change-Id: Ia933cb4812eee06008a602bacf324042b51cb273
diff --git a/core/product.mk b/core/product.mk
index 8031a34..1fbc3ee 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -505,6 +505,9 @@
# 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)
diff --git a/core/soong_config.mk b/core/soong_config.mk
index b485285..dcd654d 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -254,6 +254,8 @@
$(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))\