From ac25c069f9e32bbc8031dcb7816b9d97696fc8be Mon Sep 17 00:00:00 2001 From: danascape Date: Mon, 3 Apr 2023 02:50:09 +0200 Subject: [PATCH] rosemary: Ship separate system_ext image Change-Id: I729450c33dc089528b5e0e0dc639f8af9bd53740 --- BoardConfig.mk | 6 +++++- rootdir/etc/fstab.mt6785 | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 7b80fd5..732d9b4 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -15,6 +15,7 @@ AB_OTA_PARTITIONS := \ boot \ dtbo \ system \ + system_ext \ product \ vendor \ vbmeta \ @@ -112,6 +113,7 @@ BOARD_MAIN_SIZE := 9122611200 BOARD_MAIN_PARTITION_LIST := \ system \ + system_ext \ product \ vendor @@ -119,12 +121,14 @@ BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 2147483648 BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE := 2147483648 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs TARGET_COPY_OUT_VENDOR := vendor TARGET_COPY_OUT_PRODUCT := product +TARGET_COPY_OUT_SYSTEM_EXT := system_ext BOARD_USES_METADATA_PARTITION := true @@ -161,7 +165,7 @@ BOARD_AVB_RECOVERY_ALGORITHM := SHA256_RSA4096 BOARD_AVB_RECOVERY_ROLLBACK_INDEX := 1 BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION := 1 -BOARD_AVB_VBMETA_SYSTEM := product system +BOARD_AVB_VBMETA_SYSTEM := product system system_ext BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA4096 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := 1 diff --git a/rootdir/etc/fstab.mt6785 b/rootdir/etc/fstab.mt6785 index b2090b6..50265bd 100644 --- a/rootdir/etc/fstab.mt6785 +++ b/rootdir/etc/fstab.mt6785 @@ -1,6 +1,7 @@ # Android fstab file. # system /system ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,avb_keys=/avb/q-developer-gsi.avbpubkey:/avb/r-developer-gsi.avbpubkey:/avb/s-developer-gsi.avbpubkey +system_ext /system_ext ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount vendor /vendor ext4 ro wait,slotselect,avb,logical,first_stage_mount product /product ext4 ro wait,slotselect,avb,logical,first_stage_mount /dev/block/platform/bootdevice/by-name/vbmeta /vbmeta emmc defaults defaults