diff options
| author | Bowgo Tsai <bowgotsai@google.com> | 2022-02-23 16:40:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-23 16:40:51 +0000 |
| commit | b5e8b17872a4bb1e83f6aaa827ac39a3bff54264 (patch) | |
| tree | 4cf0dc93e08d38aed81d92dbc5f86de55ab4a280 | |
| parent | 4627d8b7e1493269f53710919c0a363b1eba33a4 (diff) | |
| parent | ba85f96e35651daf23d7c38d8e80eaf95a00fee2 (diff) | |
| download | common-b5e8b17872a4bb1e83f6aaa827ac39a3bff54264.tar.gz | |
Merge "Excluding the ramdisk from GKI boot images" am: ba85f96e35
Original change: https://android-review.googlesource.com/c/device/generic/common/+/1994910
Change-Id: I2d3721ca8b2906368b90b25c2aa9efd53545d789
| -rw-r--r-- | BoardConfigGkiCommon.mk | 5 | ||||
| -rw-r--r-- | gki_common.mk | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/BoardConfigGkiCommon.mk b/BoardConfigGkiCommon.mk index 09b77d6..059eeec 100644 --- a/BoardConfigGkiCommon.mk +++ b/BoardConfigGkiCommon.mk @@ -34,13 +34,16 @@ BOARD_AVB_INIT_BOOT_ROLLBACK_INDEX_LOCATION := 3 # Sets boot SPL. BOOT_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH) -# Boot image with ramdisk and kernel +# Boot image with kernel only (no ramdisk) BOARD_BOOT_HEADER_VERSION := 4 BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) BOARD_USES_RECOVERY_AS_BOOT := TARGET_NO_KERNEL := false BOARD_USES_GENERIC_KERNEL_IMAGE := true +# Pretend as a no-ramdisk device to exclude the ramdisk from the GKI boot image +BOARD_BUILD_SYSTEM_ROOT_IMAGE := true + # No system image BOARD_SYSTEMIMAGE_PARTITION_SIZE := diff --git a/gki_common.mk b/gki_common.mk index 33a9701..4e21af1 100644 --- a/gki_common.mk +++ b/gki_common.mk @@ -84,7 +84,7 @@ $(call _output_kernel_files,$(_output-kernel-info-files),$(1),$(2)) endef # -# Output boot.img and init-boot.img +# Output boot.img # $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk) PRODUCT_BUILD_BOOT_IMAGE := true |