rtwo: fix logical partition mounts and recovery signing

This commit is contained in:
Nicholas Andrew 2026-07-18 20:55:09 -04:00
commit 362b70d84d
3 changed files with 10 additions and 20 deletions

View file

@ -198,9 +198,3 @@ TW_CUSTOM_CLOCK_POS := 50
TW_CUSTOM_BATTERY_POS := 800
TW_HAS_EDL_MODE := true
# End*
# A-Team Private Signing - Added by signKEYS
# We use ?= to bypass readonly restrictions in some trees
PRODUCT_DEFAULT_DEV_CERTIFICATE ?= vendor/ateam/releasekey
PRODUCT_OTA_PUBLIC_KEYS ?= vendor/ateam/releasekey.x509.pem
PRODUCT_EXTRA_RECOVERY_KEYS ?= vendor/ateam/releasekey

View file

@ -35,20 +35,13 @@
# 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>
/dev/block/mapper/system /system_root erofs ro wait,first_stage_mount
/dev/block/mapper/system /system_root f2fs ro wait,first_stage_mount
/dev/block/mapper/system /system_root ext4 ro wait,first_stage_mount
/dev/block/mapper/vendor /vendor erofs ro wait,first_stage_mount
/dev/block/mapper/vendor /vendor ext4 ro wait,first_stage_mount
/dev/block/mapper/system_ext /system_ext erofs ro wait,first_stage_mount
/dev/block/mapper/system_ext /system_ext ext4 ro wait,first_stage_mount
/dev/block/mapper/vendor_dlkm /vendor_dlkm erofs ro wait,first_stage_mount
/dev/block/mapper/vendor_dlkm /vendor_dlkm ext4 ro wait,first_stage_mount
/dev/block/mapper/product /product erofs ro wait,first_stage_mount
/dev/block/mapper/product /product ext4 ro wait,first_stage_mount
/dev/block/mapper/system_dlkm /system_dlkm erofs ro wait,first_stage_mount
/dev/block/mapper/system_dlkm /system_dlkm ext4 ro wait,first_stage_mount
/dev/block/mapper/system /system_root erofs ro wait,first_stage_mount,logical,slotselect
/dev/block/mapper/vendor /vendor erofs ro wait,first_stage_mount,logical,slotselect
/dev/block/mapper/system_ext /system_ext erofs ro wait,first_stage_mount,logical,slotselect
/dev/block/mapper/vendor_dlkm /vendor_dlkm erofs ro wait,first_stage_mount,logical,slotselect
/dev/block/mapper/product /product erofs ro wait,first_stage_mount,logical,slotselect
/dev/block/mapper/system_dlkm /system_dlkm erofs ro wait,first_stage_mount,logical,slotselect
/dev/block/by-name/metadata /metadata f2fs noatime,nosuid,nodev,discard wait,check,formattable,first_stage_mount
/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,usrquota,grpquota,fsync_mode=nobarrier,reserve_root=32768,resgid=5678,whint_mode=fs-based,inlinecrypt latemount,wait,check,,quota,reservedsize=128M,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,checkpoint=fs,fscompress,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,metadata_encryption=aes-256-xts:wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption
/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,whint_mode=fs-based,inlinecrypt latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,metadata_encryption=aes-256-xts:wrappedkey_v0,quota,reservedsize=128M,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,checkpoint=fs
/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults,first_stage_mount

View file

@ -30,3 +30,6 @@ PRODUCT_MANUFACTURER := motorola
# Virtual A/B OTA support
$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk)
# A-Team signing configuration
$(call inherit-product, vendor/ateam/android.mk)