Evolution-X-Tensor/device_google_gs201
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "use erofs for RO partitions" am: 0c024a7f2b

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18494501

Change-Id: If2a1d4fde080cd0c838494812933196e1114abf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jaegeuk Kim 2022-05-23 22:31:03 +00:00 • committed by Automerger Merge Worker
commit 453105b5cc
4 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
BoardConfig-common.mk
View file

@ -158,15 +158,12 @@ PRODUCT_FS_COMPRESSION := 1
BOARD_FLASH_BLOCK_SIZE := 4096 BOARD_FLASH_BLOCK_SIZE := 4096
BOARD_MOUNT_SDCARD_RW := true BOARD_MOUNT_SDCARD_RW := true
# system.img
BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := erofs
# product.img # product.img
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := erofs BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
TARGET_COPY_OUT_PRODUCT := product TARGET_COPY_OUT_PRODUCT := product
# system_ext.img # system_ext.img
BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := erofs BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
TARGET_COPY_OUT_SYSTEM_EXT := system_ext TARGET_COPY_OUT_SYSTEM_EXT := system_ext
# persist.img # persist.img
@ -200,7 +197,7 @@ BOARD_SUPER_PARTITION_ERROR_LIMIT := 8006926336
# Build a separate system_dlkm partition # Build a separate system_dlkm partition
BOARD_USES_SYSTEM_DLKMIMAGE := true 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 TARGET_COPY_OUT_SYSTEM_DLKM := system_dlkm
# Testing related defines # Testing related defines

12
conf/fstab.gs201.in
View file

@ -4,12 +4,12 @@
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
# #
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> #<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
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
system_dlkm /system_dlkm erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 system_dlkm /system_dlkm ext4 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 system_ext /system_ext ext4 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 product /product ext4 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 /vendor ext4 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 vendor_dlkm /vendor_dlkm ext4 ro wait,slotselect,avb=vbmeta,logical,first_stage_mount
/dev/block/platform/14700000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount /dev/block/platform/14700000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount
/dev/block/platform/14700000.ufs/by-name/init_boot /init_boot emmc defaults slotselect,avb=init_boot,first_stage_mount /dev/block/platform/14700000.ufs/by-name/init_boot /init_boot emmc defaults slotselect,avb=init_boot,first_stage_mount
/dev/block/platform/14700000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable /dev/block/platform/14700000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable

2
conf/fstab.postinstall
View file

@ -1,4 +1,4 @@
# Android fstab file. # Android fstab file.
# #
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> #<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
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

2
device.mk
View file

@ -21,7 +21,7 @@ TARGET_BOARD_PLATFORM := gs201
AB_OTA_POSTINSTALL_CONFIG += \ AB_OTA_POSTINSTALL_CONFIG += \
RUN_POSTINSTALL_system=true \ RUN_POSTINSTALL_system=true \
POSTINSTALL_PATH_system=system/bin/otapreopt_script \ POSTINSTALL_PATH_system=system/bin/otapreopt_script \
FILESYSTEM_TYPE_system=erofs \ FILESYSTEM_TYPE_system=ext4 \
POSTINSTALL_OPTIONAL_system=true POSTINSTALL_OPTIONAL_system=true
# Set Vendor SPL to match platform # Set Vendor SPL to match platform