diff options
| -rw-r--r-- | core/Makefile | 9 | ||||
| -rw-r--r-- | core/soong_config.mk | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/core/Makefile b/core/Makefile index 09c815ed98..18f2c39a74 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1306,11 +1306,8 @@ 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 +ifneq ($(BUILDING_INIT_BOOT_IMAGE),true) + INTERNAL_BOOTIMAGE_ARGS += --ramdisk $(INSTALLED_RAMDISK_TARGET) endif ifndef BUILDING_VENDOR_BOOT_IMAGE @@ -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)) diff --git a/core/soong_config.mk b/core/soong_config.mk index 947f66f8c2..30acbbab4d 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -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))) |