commit 14127a051bcad04bc01129a4321de84f3f32e6a6
author Spandan Das <spandandas@google.com> Mon Mar 03 09:36:16 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 03 09:36:16 2025 -0800
tree 88c5727e28dae9f0dc77602970617693f1480801
parent b3814f971501bfb7c43f66c7ac0eb46197ae126e
parent a1a730e697bcd56e93466186495fe3e0b2222424

Merge changes from topics "fastboot-info.txt", "super_in_update_package" into main

* changes:
  Export TARGET_BOARD_FASTBOOT_INFO_FILE to soong
  Export BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE to soong

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index bd52d88..c3cbaf3 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -488,6 +488,7 @@
   $(call add_json_list, AbOtaPartitions, $(AB_OTA_PARTITIONS))
   $(call add_json_list, AbOtaKeys, $(PRODUCT_OTA_PUBLIC_KEYS))
   $(call add_json_list, AbOtaPostInstallConfig, $(AB_OTA_POSTINSTALL_CONFIG))
+  $(call add_json_bool, BoardSuperImageInUpdatePackage, $(filter true,$(BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE)))
 
   # Avb (android verified boot) stuff
   $(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))
@@ -568,6 +569,9 @@
 
   $(call add_json_str, ReleaseToolsExtensionDir, $(firstword $(TARGET_RELEASETOOLS_EXTENSIONS) $($(TARGET_DEVICE_DIR)/../common)))
 
+  # Fastboot
+  $(call add_json_str, BoardFastbootInfoFile, $(TARGET_BOARD_FASTBOOT_INFO_FILE))
+
 $(call end_json_map)
 
 # For converting vintf_data