diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-02-21 11:30:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-21 11:30:15 +0000 |
| commit | 4627d8b7e1493269f53710919c0a363b1eba33a4 (patch) | |
| tree | 8abe44be277b40d881ce8a41a7fb8cd46c18f58e | |
| parent | 5c768f6614685593062446a23d6f285fc7669f8a (diff) | |
| parent | 6bf3a0aec429f9d4368e6dff1f1111373459af74 (diff) | |
| download | common-4627d8b7e1493269f53710919c0a363b1eba33a4.tar.gz | |
Merge "Remove init_boot.img from gki_$arch" am: 6bf3a0aec4
Original change: https://android-review.googlesource.com/c/device/generic/common/+/1992891
Change-Id: I73399a3e4056ac6a2265716d34df92b3672828d0
| -rw-r--r-- | BoardConfigGkiCommon.mk | 7 | ||||
| -rw-r--r-- | gki_common.mk | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/BoardConfigGkiCommon.mk b/BoardConfigGkiCommon.mk index 662e0ec..09b77d6 100644 --- a/BoardConfigGkiCommon.mk +++ b/BoardConfigGkiCommon.mk @@ -41,13 +41,6 @@ BOARD_USES_RECOVERY_AS_BOOT := TARGET_NO_KERNEL := false BOARD_USES_GENERIC_KERNEL_IMAGE := true -# Init boot image -BOARD_RAMDISK_USE_LZ4 := true -BOARD_INIT_BOOT_HEADER_VERSION := 4 -BOARD_MKBOOTIMG_INIT_ARGS += --header_version $(BOARD_INIT_BOOT_HEADER_VERSION) -# TODO(b/212486689) Need to confirm the size -BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE := 8388608 - # No system image BOARD_SYSTEMIMAGE_PARTITION_SIZE := diff --git a/gki_common.mk b/gki_common.mk index b2b717d..33a9701 100644 --- a/gki_common.mk +++ b/gki_common.mk @@ -88,8 +88,8 @@ endef # $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk) PRODUCT_BUILD_BOOT_IMAGE := true -PRODUCT_BUILD_INIT_BOOT_IMAGE := true +PRODUCT_BUILD_INIT_BOOT_IMAGE := false PRODUCT_BUILD_CACHE_IMAGE := false PRODUCT_BUILD_ODM_IMAGE := false PRODUCT_BUILD_VENDOR_DLKM_IMAGE := false |