aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-04-20 11:50:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-20 11:50:40 +0000
commit1b2e388eae24eb123442405a904910328c2cae3d (patch)
tree101cf811ec91d48fca201d0ec62be187462e3f69
parentdc4427d74d8876d3e2e2138b9b4335950334af21 (diff)
parent2f2ba980316d912b5ba4e687ff2975a72481e9dc (diff)
downloadcommon-1b2e388eae24eb123442405a904910328c2cae3d.tar.gz
Merge "Removing BOARD_BUILD_SYSTEM_ROOT_IMAGE" am: 239ab9e265 am: cafddba4e8 am: 78b7d28908 am: c44d96b20d am: 2f2ba98031
Original change: https://android-review.googlesource.com/c/device/generic/common/+/2063543 Change-Id: I5a3971d8c2012f3dd1eef35b3dd1dbe3c7ff6373 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--BoardConfigGkiCommon.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/BoardConfigGkiCommon.mk b/BoardConfigGkiCommon.mk
index eedfe28..c7970d7 100644
--- a/BoardConfigGkiCommon.mk
+++ b/BoardConfigGkiCommon.mk
@@ -40,9 +40,7 @@ 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
+BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK ?= true
# No system image
BOARD_SYSTEMIMAGE_PARTITION_SIZE :=