Use new fstab_suffix feature
Now the fstab suffix can be controlled independently of ro.hardware or
ro.hardware.platform, we can install both f2fs and ext4 fstabs
concurrently. This change does not implement dynamic switching.
Bug: 142424832
Change-Id: I4084aa06c404e5ded0cce13d0ec7ce64efcdccf8
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 21e618a..48fe9aa 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -155,7 +155,7 @@
TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888
TARGET_RECOVERY_UI_LIB := librecovery_ui_cuttlefish
-TARGET_RECOVERY_FSTAB ?= device/google/cuttlefish/shared/config/fstab
+TARGET_RECOVERY_FSTAB ?= device/google/cuttlefish/shared/config/fstab.f2fs
BOARD_SUPER_PARTITION_SIZE := 6442450944
BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions
@@ -175,6 +175,14 @@
BOARD_KERNEL_CMDLINE += security=selinux
BOARD_KERNEL_CMDLINE += androidboot.console=ttyS1
+ifeq ($(TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE),f2fs)
+BOARD_KERNEL_CMDLINE += androidboot.fstab_suffix=f2fs
+endif
+
+ifeq ($(TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE),ext4)
+BOARD_KERNEL_CMDLINE += androidboot.fstab_suffix=ext4
+endif
+
BOARD_INCLUDE_DTB_IN_BOOTIMG := true
BOARD_BOOT_HEADER_VERSION := 3
BOARD_USES_RECOVERY_AS_BOOT := true
