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

Commit e16e13db authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

Merge "Export ProductBuildVendorBootImage to soong" into main

parents bdf5eff5 a6a0007e

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -1654,6 +1654,8 @@ INTERNAL_VENDOR_RAMDISK_FILES := $(filter $(TARGET_VENDOR_RAMDISK_OUT)/%, \ 
    $(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

+1 −0
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse) 
  # 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))