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

Commit c2c09d7a authored by Wei Li's avatar Wei Li Committed by Gerrit Code Review
Browse files

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
parents cedd5a25 31592c1b

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
@@ -254,6 +254,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))\