Merge "Removing BOARD_BUILD_SYSTEM_ROOT_IMAGE" am: 239ab9e265 am: cafddba4e8 am: 78b7d28908 am: c44d96b20d

Original change: https://android-review.googlesource.com/c/device/generic/common/+/2063543

Change-Id: Ib528f9c9ad3223f40bf461586b4944fe308a9eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

BoardConfigGkiCommon.mk

diff --git a/BoardConfigGkiCommon.mk b/BoardConfigGkiCommon.mk
index eedfe28..c7970d7 100644
--- a/BoardConfigGkiCommon.mk
+++ b/BoardConfigGkiCommon.mk
@@ -40,9 +40,7 @@
 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 :=