Enable system_ext on bonito/sargo
Bug: 134359158
Bug: 137083818
Test: build and flash; check if /system_ext is not empty
Change-Id: I2c37b19bbd11a6368d87baa79e8cdf3c180bbbf7
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index a89d076..1c86700 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -80,9 +80,11 @@
system \
vbmeta \
dtbo \
- product
+ product \
+ system_ext
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
# Partitions (listed in the file) to be wiped under recovery.
TARGET_RECOVERY_WIPE := device/google/bonito/recovery.wipe
@@ -110,7 +112,8 @@
BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \
system \
vendor \
- product
+ product \
+ system_ext
BOARD_SUPER_PARTITION_SIZE := 4072669184
BOARD_SUPER_PARTITION_METADATA_DEVICE := system
diff --git a/fstab.hardware b/fstab.hardware
index 48e262a..2c05cf6 100644
--- a/fstab.hardware
+++ b/fstab.hardware
@@ -7,6 +7,7 @@
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta,logical,first_stage_mount
+system_ext /system_ext ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount
vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount
product /product ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount
/dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard,sync wait,formattable,first_stage_mount
diff --git a/gpt-utils/gpt-utils.h b/gpt-utils/gpt-utils.h
index dcf805b..6fcf2e0 100644
--- a/gpt-utils/gpt-utils.h
+++ b/gpt-utils/gpt-utils.h
@@ -84,7 +84,8 @@
"dtbo", "hyp", "keymaster", "qupfw", "storsec", \
"tz", "vbmeta", "xbl_config"
-#define AB_PTN_LIST PTN_SWAP_LIST, "boot", "system", "vendor", "modem"
+#define AB_PTN_LIST PTN_SWAP_LIST, "boot", "system", "vendor", "modem", \
+ "system_ext", "product"
#define BOOT_DEV_DIR "/dev/block/bootdevice/by-name"
/******************************************************************************
