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

Commit f4e56557 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Export boot partition variables to soong" into main am: 634669fb 

Original change: https://android-review.googlesource.com/c/platform/build/+/3357041



Change-Id: I3e75910f4b3196c4ab6f57fb4f2574a2bccae2ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65d54a9f 634669fb

core/soong_config.mk

+14 −1
Original line number Diff line number Diff line
@@ -426,6 +426,20 @@ $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse) 
  $(call add_json_str, BoardFlashLogicalBlockSize, $(BOARD_FLASH_LOGICAL_BLOCK_SIZE))

  $(call add_json_str, BoardFlashEraseBlockSize, $(BOARD_FLASH_ERASE_BLOCK_SIZE))

  $(call add_json_bool, BuildingVbmetaImage, $(BUILDING_VBMETA_IMAGE))



  # 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_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))

  $(call add_json_str, BoardPrebuiltInitBootimage, $(BOARD_PREBUILT_INIT_BOOT_IMAGE))

  $(call add_json_str, BoardBootimagePartitionSize, $(BOARD_BOOTIMAGE_PARTITION_SIZE))

  $(call add_json_str, BoardInitBootimagePartitionSize, $(BOARD_INIT_BOOTIMAGE_PARTITION_SIZE))

  $(call add_json_str, BoardBootHeaderVersion, $(BOARD_BOOT_HEADER_VERSION))

  $(call add_json_str, TargetKernelPath, $(TARGET_KERNEL_PATH))



  # Avb (android verified boot) stuff

  $(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))

  $(call add_json_str, BoardAvbAlgorithm, $(BOARD_AVB_ALGORITHM))

  $(call add_json_str, BoardAvbKeyPath, $(BOARD_AVB_KEY_PATH))
@@ -441,7 +455,6 @@ $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse) 
    $(call end_json_map))

  $(call end_json_map)



  $(call add_json_bool, BoardUsesRecoveryAsBoot, $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)))

  $(call add_json_bool, ProductUseDynamicPartitionSize, $(filter true,$(PRODUCT_USE_DYNAMIC_PARTITION_SIZE)))

  $(call add_json_bool, CopyImagesForTargetFilesZip, $(filter true,$(COPY_IMAGES_FOR_TARGET_FILES_ZIP)))