diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index ba1f33eb..26e8d959 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -168,14 +168,14 @@ BOARD_FLASH_BLOCK_SIZE := 4096 BOARD_MOUNT_SDCARD_RW := true # system.img -BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := erofs +BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4 # product.img -BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := erofs +BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_PRODUCT := product # system_ext.img -BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := erofs +BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_SYSTEM_EXT := system_ext # persist.img @@ -209,7 +209,7 @@ BOARD_SUPER_PARTITION_ERROR_LIMIT := 8006926336 # Build a separate system_dlkm partition BOARD_USES_SYSTEM_DLKMIMAGE := true -BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := erofs +BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_SYSTEM_DLKM := system_dlkm # diff --git a/conf/fstab.modem b/conf/fstab.modem index d5e22f6a..a5e5fd49 100644 --- a/conf/fstab.modem +++ b/conf/fstab.modem @@ -1,5 +1,4 @@ # Android fstab file. # # Create the specific fstab file for modem partition as flexibility -/dev/block/platform/13200000.ufs/by-name/modem /mnt/vendor/modem_img erofs ro,defaults,context=u:object_r:modem_img_file:s0 wait,slotselect /dev/block/platform/13200000.ufs/by-name/modem /mnt/vendor/modem_img ext4 ro,defaults,context=u:object_r:modem_img_file:s0,barrier=1 wait,slotselect diff --git a/conf/fstab.postinstall b/conf/fstab.postinstall index 16b167c2..955fba71 100644 --- a/conf/fstab.postinstall +++ b/conf/fstab.postinstall @@ -1,4 +1,4 @@ # Android fstab file. # # -system /postinstall erofs ro,nosuid,nodev,noexec slotselect_other,logical,avb_keys=/product/etc/security/avb/system_other.avbpubkey +system /postinstall ext4 ro,nosuid,nodev,noexec slotselect_other,logical,avb_keys=/product/etc/security/avb/system_other.avbpubkey diff --git a/conf/fstab.zuma.in b/conf/fstab.zuma.in index eac2f518..9a55ecbf 100644 --- a/conf/fstab.zuma.in +++ b/conf/fstab.zuma.in @@ -4,14 +4,14 @@ # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK # # -system /system erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +system /system ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 # During compliance testing, the previous line would fail (because GSI is ext4), and the next line would be used to mount GSI. system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -system_dlkm /system_dlkm erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -system_ext /system_ext erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -product /product erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -vendor /vendor erofs ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128 -vendor_dlkm /vendor_dlkm erofs ro wait,slotselect,avb=vbmeta,logical,first_stage_mount +system_dlkm /system_dlkm ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +system_ext /system_ext ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +product /product ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +vendor /vendor ext4 ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128 +vendor_dlkm /vendor_dlkm ext4 ro wait,slotselect,avb=vbmeta,logical,first_stage_mount /dev/block/platform/13200000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount /dev/block/platform/13200000.ufs/by-name/init_boot /init_boot emmc defaults slotselect,avb=init_boot,first_stage_mount /dev/block/platform/13200000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable @@ -20,6 +20,6 @@ vendor_dlkm /vendor_dlkm /dev/block/platform/13200000.ufs/by-name/misc /misc emmc defaults wait /dev/block/platform/13200000.ufs/by-name/metadata /metadata f2fs noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount #/dev/block/platform/13200000.ufs/by-name/pvmfw /pvmfw emmc defaults wait,slotselect,avb=pvmfw,first_stage_mount -/dev/block/platform/13200000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt,compress_extension=apk,compress_extension=apex,compress_extension=so,compress_extension=vdex,compress_extension=odex,atgc,checkpoint_merge,compress_cache latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fileencryption=@fileencryption@,metadata_encryption=@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,fscompress,readahead_size_kb=128 +/dev/block/platform/13200000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,compress_extension=apk,compress_extension=apex,compress_extension=so,compress_extension=vdex,compress_extension=odex,atgc,checkpoint_merge,compress_cache latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fscompress,readahead_size_kb=128 /dev/block/platform/13200000.ufs/by-name/vbmeta /vbmeta emmc defaults slotselect,first_stage_mount /devices/platform/11210000.usb* auto vfat defaults voldmanaged=usb:auto diff --git a/device.mk b/device.mk index 42b6083f..ca7dc331 100644 --- a/device.mk +++ b/device.mk @@ -22,7 +22,7 @@ ALLOW_MISSING_DEPENDENCIES := true AB_OTA_POSTINSTALL_CONFIG += \ RUN_POSTINSTALL_system=true \ POSTINSTALL_PATH_system=system/bin/otapreopt_script \ - FILESYSTEM_TYPE_system=erofs \ + FILESYSTEM_TYPE_system=ext4 \ POSTINSTALL_OPTIONAL_system=true # Set Vendor SPL to match platform