From 0c791bedb4006165da3c98865bf1408ad01de530 Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Fri, 1 Apr 2022 14:27:21 +0800 Subject: [PATCH] Support building EROFS for GSI targets The EROFS is planned to replace the ext4 as the file system format of readonly partitions. This patch is enabling the ability to build GSI with EROFS. The usage is $ GSI_FILE_SYSTEM_TYPE=erofs make -j Bug: 227552340 Test: lunch gsi_arm64-user; GSI_FILE_SYSTEM_TYPE=erofs make -j Test: Verify the file system format of system.img Change-Id: Ie815002c677d099c4db0ab7ca22db16ac6123659 --- target/board/BoardConfigGsiCommon.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index 8e062bac8c..45cd5157f8 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -11,8 +11,11 @@ TARGET_NO_KERNEL := true # This flag is set by mainline but isn't desired for GSI. BOARD_USES_SYSTEM_OTHER_ODEX := -# system.img is always ext4 and non-sparsed. +# system.img is ext4/erofs and non-sparsed. +GSI_FILE_SYSTEM_TYPE ?= ext4 +BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := $(GSI_FILE_SYSTEM_TYPE) TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true +TARGET_USERIMAGES_SPARSE_EROFS_DISABLED := true # GSI also includes make_f2fs to support userdata parition in f2fs # for some devices