cheeseburger: Cleanup and fix decryption

* Take qseecomd from sagit

Signed-off-by: Sanyam Jain <sanyam@witworks.com>

diff --git a/BoardConfig.mk b/BoardConfig.mk
index ed05c0bd3e86eac7eae9cc5bf6155fc5a5e57b8f..4e63f00c18ea98b1bb146f5d68465ebb5f5a87a9 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -42,7 +42,6 @@ ENABLE_SCHEDBOOST := true
 # Bootloader
 TARGET_BOOTLOADER_BOARD_NAME := msm8998
 TARGET_NO_BOOTLOADER := true
-
 TARGET_USES_UEFI := true
 
 # Crypto
@@ -91,4 +90,3 @@ TW_MAX_BRIGHTNESS := 255
 TW_NO_USB_STORAGE := true
 TW_SCREEN_BLANK_ON_BOOT := true
 TW_THEME := portrait_hdpi
-TWRP_INCLUDE_LOGCAT := true

diff --git a/recovery/root/fstab.qcom b/recovery/root/fstab.qcom
deleted file mode 100644 (file)
index ca5bafe..0000000
--- a/recovery/root/fstab.qcom
+++ /dev/null
@@ -1,20 +0,0 @@
-# Android fstab file.
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-
-#TODO: Add 'check' as fs_mgr_flags with data partition.
-# Currently we dont have e2fsck compiled. So fs check would failed.
-
-#<src>                                   <mnt_point>        <type> <mnt_flags and options>                                       <fs_mgr_flags>a
-/dev/block/bootdevice/by-name/boot       /boot              emmc   defaults                                                      recoveryonly
-/dev/block/bootdevice/by-name/recovery   /recovery          emmc   defaults                                                      recoveryonly
-/dev/block/bootdevice/by-name/system     /system            ext4   ro,barrier=1,noatime                                          wait
-/dev/block/bootdevice/by-name/userdata   /data              f2fs   noatime,nosuid,nodev,discard,nodiratime,inline_xattr,errors=continue         wait,check,encryptable=footer,resize
-/dev/block/bootdevice/by-name/userdata   /data              ext4   nosuid,nodev,barrier=1,noauto_da_alloc,discard,errors=continue   wait,check,encryptable=footer,resize
-#/devices/soc/c0a4900.sdhci/mmc_host*    /storage/sdcard1   vfat   nosuid,nodev                                                  wait,voldmanaged=sdcard1:auto,encryptable=footer
-/dev/block/zram0                         none               swap   defaults                                                      zramsize=536870912
-/dev/block/bootdevice/by-name/misc       /misc              emmc   defaults                                                      defaults
-/dev/block/bootdevice/by-name/modem      /firmware          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  /bt_firmware       vfat   ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait
-/dev/block/bootdevice/by-name/cache      /cache             ext4   rw,nosuid,nodev,barrier=1                                      wait,check
-/devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto/usb* auto auto defaults voldmanaged=usbotg:auto

diff --git a/recovery/root/sbin/qseecomd b/recovery/root/sbin/qseecomd
index 48b4bcb783dab71a526a4dd9e9e599d3444db00a..91e106fdd2cb90de0b86446aaf17ee0952e369be 100755 (executable)
Binary files a/recovery/root/sbin/qseecomd and b/recovery/root/sbin/qseecomd differ

diff --git a/recovery/root/vendor/lib64/libkeymasterprovision.so b/recovery/root/vendor/lib64/libkeymasterprovision.so
deleted file mode 100644 (file)
index c2cc248..0000000
Binary files a/recovery/root/vendor/lib64/libkeymasterprovision.so and /dev/null differ

diff --git a/recovery/root/vendor/lib64/libsecureuisvc_jni.so b/recovery/root/vendor/lib64/libsecureuisvc_jni.so
deleted file mode 100644 (file)
index 81f9160..0000000
Binary files a/recovery/root/vendor/lib64/libsecureuisvc_jni.so and /dev/null differ