Enable BOARD_BUILD_SYSTEM_ROOT_IMAGE.
This enables a mode where the initramfs (ramdisk.img) and system.img
files are combined into a bootable 'root' system.img. It is needed for
GSI compatibility and treble compliance.
Bug: 110097226
Change-Id: Ibd011c6f2a7cdfdc36e695e717b337b563784876
Merged-In: Ibd011c6f2a7cdfdc36e695e717b337b563784876
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 6fa12ba..4aa7380 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -25,6 +25,7 @@
TARGET_COPY_OUT_VENDOR := vendor
TARGET_NO_RECOVERY := true
+BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
BOARD_USES_GENERIC_AUDIO := false
USE_CAMERA_STUB := true
TARGET_USERIMAGES_USE_EXT4 := true
diff --git a/shared/config/cuttlefish.dtb b/shared/config/cuttlefish.dtb
index 1c75cd6..bdffbc7 100644
--- a/shared/config/cuttlefish.dtb
+++ b/shared/config/cuttlefish.dtb
Binary files differ
diff --git a/shared/config/cuttlefish.dts b/shared/config/cuttlefish.dts
index 70a34fc..d0dedbe 100644
--- a/shared/config/cuttlefish.dts
+++ b/shared/config/cuttlefish.dts
@@ -22,14 +22,6 @@
compatible = "android,firmware";
fstab {
compatible = "android,fstab";
- system {
- compatible = "android,system";
- dev = "/dev/block/vda";
- type = "ext4";
- mnt_flags = "noatime,ro,errors=panic";
- fsmgr_flags = "wait";
- };
-
vendor {
compatible = "android,vendor";
dev = "/dev/block/vdd";
