commit 774ec1033fa367eabf6e5c7ac49299d5ff4184d8
author Zhuoyao Zhang <zhuoyao@google.com> Thu Nov 21 21:51:24 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 21 21:51:24 2024 +0000
tree d06246d7555db8f7e5b49dffc2d132841fcfe397
parent 66694b4d8f735ff9acd3414feff313ad7d56987b
parent bedd13b544217d4c3984624fe62d03a8fb917807

Merge "Rollout the edit monitor to 100% user" into main

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index c9c6e4a..081aa20 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -380,7 +380,7 @@
   $(call add_json_str,  ProductDirectory,    $(dir $(INTERNAL_PRODUCT)))
 
   $(call add_json_map,PartitionQualifiedVariables)
-  $(foreach image_type,SYSTEM VENDOR CACHE USERDATA PRODUCT SYSTEM_EXT OEM ODM VENDOR_DLKM ODM_DLKM SYSTEM_DLKM, \
+  $(foreach image_type,INIT_BOOT BOOT VENDOR_BOOT SYSTEM VENDOR CACHE USERDATA PRODUCT SYSTEM_EXT OEM ODM VENDOR_DLKM ODM_DLKM SYSTEM_DLKM, \
     $(call add_json_map,$(call to-lower,$(image_type))) \
     $(call add_json_bool, BuildingImage, $(filter true,$(BUILDING_$(image_type)_IMAGE))) \
     $(call add_json_str, BoardErofsCompressor, $(BOARD_$(image_type)IMAGE_EROFS_COMPRESSOR)) \
@@ -444,6 +444,7 @@
   $(call add_json_str, BootSecurityPatch, $(BOOT_SECURITY_PATCH))
   $(call add_json_str, InitBootSecurityPatch, $(INIT_BOOT_SECURITY_PATCH))
   $(call add_json_str, VendorSecurityPatch, $(VENDOR_SECURITY_PATCH))
+  $(call add_json_bool, BoardIncludeDtbInBootimg, $(BOARD_INCLUDE_DTB_IN_BOOTIMG))
 
   # Avb (android verified boot) stuff
   $(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))