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

Commit c9dd2d5b authored by Justin Yun's avatar Justin Yun
Browse files

Add soong system image configs 

USE_SOONG_DEFINED_SYSTEM_IMAGE is true when the target is using a
system image defined in soong.
PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE is the module name of the soong
defined system image.

Bug: 350599535
Test: lunch aosp_cf_x86_64_phone_soong_system-trunk_staging-userdebug
      && m
Change-Id: Ic5c848fb649a5a61de1a5a253438b2d77d200a6b
parent 963298af

core/soong_config.mk

+6 −0
Original line number Diff line number Diff line
@@ -236,6 +236,12 @@ $(call add_json_list, ProductPrivateSepolicyDirs, $(PRODUCT_PRIVATE_SEPOL 


$(call add_json_list, TargetFSConfigGen,                 $(TARGET_FS_CONFIG_GEN))



# Although USE_SOONG_DEFINED_SYSTEM_IMAGE determines whether to use the system image specified by

# PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE, PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE is still used to compare

# installed files between make and soong, regardless of the USE_SOONG_DEFINED_SYSTEM_IMAGE setting.

$(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_map, VendorVars)

$(foreach namespace,$(sort $(SOONG_CONFIG_NAMESPACES)),\

  $(call add_json_map, $(namespace))\