aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BoardConfigCommon.mk3
-rw-r--r--manifest.xml9
-rwxr-xr-xmsm8996.mk4
-rw-r--r--rootdir/etc/fstab.qcom4
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
@@ -329,15 +329,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<fqname>@1.2::ILocHidlGnss/gnss_vendor</fqname>
</hal>
<hal format="hidl">
- <name>vendor.qti.hardware.cryptfshw</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>ICryptfsHw</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>vendor.qti.gnss</name>
<transport>hwbinder</transport>
<version>2.0</version>
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 @@
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
/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