From a59dd415dbdad7317ea315cdf17525c4cbf1ce72 Mon Sep 17 00:00:00 2001 From: Davide Garberi Date: Sat, 27 Aug 2022 12:40:54 +0200 Subject: msm8996-common: Remove deprecated FDE flags Change-Id: I4ab9183c90cd5d294c7710c9c16d8109eecc827b --- BoardConfigCommon.mk | 3 --- manifest.xml | 9 --------- msm8996.mk | 4 ---- rootdir/etc/fstab.qcom | 4 ++-- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index a86914f..262de81 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -118,9 +118,6 @@ MAX_EGL_CACHE_SIZE := 2048*1024 OVERRIDE_RS_DRIVER := libRSDriver_adreno.so -# Encryption -TARGET_HW_DISK_ENCRYPTION := true - # Exclude serif fonts for saving system.img size. EXCLUDE_SERIF_FONTS := true diff --git a/manifest.xml b/manifest.xml index fae72a6..a2c387e 100644 --- a/manifest.xml +++ b/manifest.xml @@ -328,15 +328,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @1.2::ILocHidlGnss/gnss_vendor - - vendor.qti.hardware.cryptfshw - hwbinder - 1.0 - - ICryptfsHw - default - - vendor.qti.gnss hwbinder diff --git a/msm8996.mk b/msm8996.mk index 5edcaa5..d5ba607 100755 --- a/msm8996.mk +++ b/msm8996.mk @@ -239,10 +239,6 @@ PRODUCT_PACKAGES += \ android.hardware.health@2.1-impl.recovery \ android.hardware.health@2.1-service -# HW crypto -PRODUCT_PACKAGES += \ - vendor.qti.hardware.cryptfshw@1.0-service-qti.qsee - # HIDL PRODUCT_PACKAGES += \ android.hidl.allocator@1.0.vendor \ diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 49de759..074cb6f 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -9,8 +9,8 @@ # /dev/block/bootdevice/by-name/boot /boot emmc defaults defaults /dev/block/bootdevice/by-name/recovery /recovery emmc defaults defaults -/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,latemount,encryptable=footer -/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,latemount,encryptable=footer +/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,latemount +/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,latemount /dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait,recoveryonly /dev/block/bootdevice/by-name/factory /vendor ext4 ro,barrier=1 wait,recoveryonly /dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait,check -- cgit v1.2.3