From 2d9385fd324b65367836f9d1224842da88d3171d Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Mon, 10 Apr 2023 10:53:42 -0700 Subject: [PATCH] Set BOARD_X_FILE_SYSTEM_TYPE in the common BoardConfig file required if TARGET_COPY_OUT_X is set to `product` or `system_ext`. Bug: 111538404 Test: presubmit Change-Id: Ibe7538885cd2f00b8f4340db83be7618a0beee4a Signed-off-by: Roman Kiryanov --- target/board/BoardConfigGsiCommon.mk | 1 + target/board/BoardConfigMainlineCommon.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index 4d95b330cb..67e31dfa5f 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -36,6 +36,7 @@ BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864 TARGET_COPY_OUT_PRODUCT := system/product TARGET_COPY_OUT_SYSTEM_EXT := system/system_ext BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := +BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := # Creates metadata partition mount point under root for # the devices with metadata parition diff --git a/target/board/BoardConfigMainlineCommon.mk b/target/board/BoardConfigMainlineCommon.mk index 00f6e5b0ac..e5ac5cf546 100644 --- a/target/board/BoardConfigMainlineCommon.mk +++ b/target/board/BoardConfigMainlineCommon.mk @@ -14,6 +14,8 @@ TARGET_USERIMAGES_USE_EXT4 := true TARGET_COPY_OUT_SYSTEM_EXT := system_ext TARGET_COPY_OUT_VENDOR := vendor TARGET_COPY_OUT_PRODUCT := product +BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 # Creates metadata partition mount point under root for # the devices with metadata parition