From 84dc7ab52587f8e2e135a1fb39a2b03c34d647d9 Mon Sep 17 00:00:00 2001 From: SakilMondal Date: Wed, 21 Jul 2021 12:47:12 +0530 Subject: [PATCH] whyred: rootdir: fstab: Switch to FBE Change-Id: I07450369d0667ac7c91fae97f3239674bc7c57a5 --- BoardConfig.mk | 3 --- device.mk | 4 ---- manifest.xml | 5 ----- rootdir/etc/fstab.qcom | 6 +++--- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index f26c5dc2..1d9efa96 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -13,9 +13,6 @@ DEVICE_PATH := device/xiaomi/whyred TARGET_SCREEN_HEIGHT := 2160 TARGET_SCREEN_WIDTH := 1080 -# Crypto -TARGET_HW_DISK_ENCRYPTION := true - # Display TARGET_SCREEN_DENSITY := 440 diff --git a/device.mk b/device.mk index 0f558b70..a9e6c410 100644 --- a/device.mk +++ b/device.mk @@ -33,10 +33,6 @@ PRODUCT_PACKAGES += \ android.hardware.gatekeeper@1.0-impl \ android.hardware.gatekeeper@1.0-service -# HW crypto -PRODUCT_PACKAGES += \ - vendor.qti.hardware.cryptfshw@1.0-service-qti.qsee - # Keymaster PRODUCT_PACKAGES += \ android.hardware.keymaster@3.0-impl \ diff --git a/manifest.xml b/manifest.xml index d5d6ac6a..707b4a6b 100644 --- a/manifest.xml +++ b/manifest.xml @@ -14,9 +14,4 @@ hwbinder @1.0::IGoodixBiometricsFingerprint/default - - vendor.qti.hardware.cryptfshw - hwbinder - @1.0::ICryptfsHw/default - diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 34cfa637..8558d380 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -11,8 +11,8 @@ # Non-A/B fstab.qcom variant # -/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime,errors=panic wait,check,encryptable=footer,quota -/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,discard,background_gc=off,fsync_mode=nobarrier wait,quota,encryptable=footer +/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime,errors=panic wait,check,fileencryption=ice,quota +/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,discard,background_gc=off,fsync_mode=nobarrier wait,quota,fileencryption=ice /dev/block/bootdevice/by-name/misc /misc emmc defaults defaults /dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait /dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait @@ -21,7 +21,7 @@ /dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait /dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,discard,background_gc=off,fsync_mode=nobarrier wait,quota /dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 nosuid,nodev,barrier=1,noatime wait,check -/devices/soc/c084000.sdhci/mmc_host* auto auto nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer +/devices/soc/c084000.sdhci/mmc_host* auto auto nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=userdata /dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait,recoveryonly /dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1 wait,recoveryonly