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

Commit 5366754f authored by Yi-Yo Chiang's avatar Yi-Yo Chiang Committed by Gerrit Code Review
Browse files

Merge "Deprecate BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" into main

parents 35f40534 f0618004

core/Makefile

+2 −7
Original line number Diff line number Diff line
@@ -1306,12 +1306,9 @@ ifneq ($(strip $(TARGET_NO_KERNEL)),true) 
INTERNAL_BOOTIMAGE_ARGS := \

	$(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET))



# TODO(b/229701033): clean up BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK.

ifneq ($(BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK),true)

ifneq ($(BUILDING_INIT_BOOT_IMAGE),true)

  INTERNAL_BOOTIMAGE_ARGS += --ramdisk $(INSTALLED_RAMDISK_TARGET)

endif

endif



ifndef BUILDING_VENDOR_BOOT_IMAGE

ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG
@@ -2348,8 +2345,6 @@ $(if $(BOARD_AVB_ENABLE), \ 
)

$(if $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)),\

    $(hide) echo "recovery_as_boot=true" >> $(1))

$(if $(filter true,$(BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK)),\

    $(hide) echo "gki_boot_image_without_ramdisk=true" >> $(1))

$(hide) echo "root_dir=$(TARGET_ROOT_OUT)" >> $(1)

$(if $(filter true,$(PRODUCT_USE_DYNAMIC_PARTITION_SIZE)),\

    $(hide) echo "use_dynamic_partition_size=true" >> $(1))

core/soong_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -386,7 +386,6 @@ $(call add_json_map, PartitionVarsForBazelMigrationOnlyDoNotUse) 
  $(call add_json_str, BoardFlashEraseBlockSize, $(BOARD_FLASH_ERASE_BLOCK_SIZE))



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

  $(call add_json_bool, BoardBuildGkiBootImageWithoutRamdisk, $(filter true,$(BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK)))

  $(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)))