aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-04-19 17:04:55 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-19 17:04:55 +0000
commit78b7d2890875fd0b8e0547ec251e419cfc593bba (patch)
tree101cf811ec91d48fca201d0ec62be187462e3f69
parentaab6924c82933810e54d18160da54b34717fa6da (diff)
parentcafddba4e89645117cf76297cf0ee1cf51427f90 (diff)
downloadcommon-78b7d2890875fd0b8e0547ec251e419cfc593bba.tar.gz
Merge "Removing BOARD_BUILD_SYSTEM_ROOT_IMAGE" am: 239ab9e265 am: cafddba4e8
Original change: https://android-review.googlesource.com/c/device/generic/common/+/2063543 Change-Id: Ib91e9f91f82de7035c43e5c71192f49564a361be 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 :=