commit a6a0007ef24e16c0b79f439beac4a118416717e6
author Cole Faust <colefaust@google.com> Mon Nov 18 14:03:26 2024 -0800
committer Cole Faust <colefaust@google.com> Mon Nov 18 14:37:31 2024 -0800
tree 42e0e49b2110e88875873af66163a98456fde426
parent 5e393bc8c4a656c468621ff7fc793ed3e7b9d8e4

Export ProductBuildVendorBootImage to soong

Also add a file list file for vendor_ramdisk to compare against the
soong-built one.

Bug: 377563622
Test: Presubmits
Change-Id: I1842f767c3e560de1d11e024a7c918542e31095d

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 5e0d4df..92dd86d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1654,6 +1654,8 @@
     $(ALL_DEFAULT_INSTALLED_MODULES))
 
 INTERNAL_VENDOR_RAMDISK_TARGET := $(call intermediates-dir-for,PACKAGING,vendor_boot)/vendor_ramdisk.cpio$(RAMDISK_EXT)
+vendor_ramdisk_intermediates :=$= $(call intermediates-dir-for,PACKAGING,vendor_ramdisk)
+$(eval $(call write-partition-file-list,$(vendor_ramdisk_intermediates)/file_list.txt,$(TARGET_VENDOR_RAMDISK_OUT),$(INTERNAL_VENDOR_RAMDISK_FILES)))
 
 # Exclude recovery files in the default vendor ramdisk if including a standalone
 # recovery ramdisk in vendor_boot.

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index c5dd320..7c07010 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -430,6 +430,7 @@
   # boot image stuff
   $(call add_json_bool, BuildingRamdiskImage, $(filter true,$(BUILDING_RAMDISK_IMAGE)))
   $(call add_json_bool, ProductBuildBootImage, $(filter true,$(PRODUCT_BUILD_BOOT_IMAGE)))
+  $(call add_json_str, ProductBuildVendorBootImage, $(PRODUCT_BUILD_VENDOR_BOOT_IMAGE))
   $(call add_json_bool, ProductBuildInitBootImage, $(filter true,$(PRODUCT_BUILD_INIT_BOOT_IMAGE)))
   $(call add_json_bool, BoardUsesRecoveryAsBoot, $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)))
   $(call add_json_str, BoardPrebuiltBootimage, $(BOARD_PREBUILT_BOOT_IMAGE))