Clean up.

TODO: Fix Decryption.
cd-Crypton · Dec 7, 2022 · 3b61166 · 3b61166
1 parent 5c5efe2
commit 3b61166
Show file tree

Hide file tree

Showing 22 changed files with 4 additions and 15 deletions.
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -26,7 +26,7 @@ TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a55
 TARGET_NO_BOOTLOADER := true
 
 # Assert
-TARGET_OTA_ASSERT_DEVICE := cannon,cannong
+TARGET_OTA_ASSERT_DEVICE := cannon,cannong,cannong_global
 
 # File System
 BOARD_HAS_LARGE_FILESYSTEM := true
@@ -101,16 +101,10 @@ TARGET_VENDOR_PROP := $(DEVICE_PATH)/vendor.prop
 
 # Additional binaries & libraries needed for recovery
 TARGET_RECOVERY_DEVICE_MODULES += \
-    libkeymaster4 \
-    libkeymaster4support \
-    libpuresoftkeymasterdevice \
     ashmemd_aidl_interface-cpp \
     libashmemd_client
 
 TW_RECOVERY_ADDITIONAL_RELINK_LIBRARY_FILES += \
-    $(TARGET_OUT_SHARED_LIBRARIES)/libkeymaster4.so \
-    $(TARGET_OUT_SHARED_LIBRARIES)/libkeymaster4support.so \
-    $(TARGET_OUT_SHARED_LIBRARIES)/libpuresoftkeymasterdevice.so \
     $(TARGET_OUT_SHARED_LIBRARIES)/ashmemd_aidl_interface-cpp.so \
     $(TARGET_OUT_SHARED_LIBRARIES)/libashmemd_client.so
 
@@ -121,13 +115,10 @@ PLATFORM_VERSION := 99.87.36
 
 # TWRP Configuration
 TW_THEME := portrait_hdpi
-#TW_Y_OFFSET := 100
-#TW_H_OFFSET := -100
 RECOVERY_SDCARD_ON_DATA := true
 TW_INCLUDE_RESETPROP := true
 TW_INCLUDE_CRYPTO := true
 TW_INCLUDE_CRYPTO_FBE := true
-TW_INCLUDE_FBE_METADATA_DECRYPT := true
 TW_EXCLUDE_DEFAULT_USB_INIT := true
 TW_EXTRA_LANGUAGES := true
 TW_INCLUDE_NTFS_3G := true
@@ -137,7 +128,7 @@ TW_DEFAULT_BRIGHTNESS := 900
 TW_SCREEN_BLANK_ON_BOOT := true
 TW_INCLUDE_FUSE_EXFAT := true
 TW_INCLUDE_FASTBOOTD := true
-TW_USE_FSCRYPT_POLICY := 2
+TW_USE_FSCRYPT_POLICY := 1
 BOARD_SUPPRESS_SECURE_ERASE := true
 TARGET_USES_MKE2FS := true
 TARGET_SUPPORTS_64_BIT_APPS := false

diff --git a/recovery/root/system/etc/recovery.fstab b/recovery/root/system/etc/recovery.fstab
@@ -7,7 +7,7 @@
 /product                  ext4     product                                         flags=display=product;logical
 
 # Other Partitions
-/dev/block/by-name/metadata         /metadata       ext4                            noatime,nosuid,nodev,discard 											wait,check,formattable,wrappedkey
-/dev/block/by-name/userdata         /data           f2fs                            noatime,nosuid,nodev,discard,noflush_merge,fsync_mode=nobarrier,reserve_root=134217,resgid=1065,inlinecrypt 	wait,check,formattable,quota,resize,fileencryption=aes-256-xts:aes-256-cts:v1+inlinecrypt_optimized+wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,metadata_encryption=aes-256-xts:wrappedkey_v0
+/dev/block/by-name/metadata         /metadata       ext4                            noatime,nosuid,nodev,discard 											wait,check,formattable
+/dev/block/by-name/userdata         /data           f2fs                            noatime,nosuid,nodev,discard,noflush_merge,fsync_mode=nobarrier,reserve_root=134217,resgid=1065,inlinecrypt 	wait,check,formattable,quota,resize,checkpoint=fs,fileencryption=aes-256-xts:aes-256-cts:v1
 /dev/block/by-name/cache            /cache          ext4                            noatime,nosuid,nodev,noauto_da_alloc,discard 																	wait,check,formattable
 /dev/block/by-name/misc             /misc           emmc                            flags=display=misc
diff --git a/recovery/root/system/lib64/ashmemd_aidl_interface-cpp.so b/recovery/root/system/lib64/ashmemd_aidl_interface-cpp.so
diff --git a/recovery/root/system/lib64/libashmemd_client.so b/recovery/root/system/lib64/libashmemd_client.so
diff --git a/recovery/root/system/lib64/libkeymaster4.so b/recovery/root/system/lib64/libkeymaster4.so
diff --git a/recovery/root/system/lib64/libkeymaster4support.so b/recovery/root/system/lib64/libkeymaster4support.so
diff --git a/recovery/root/vendor/lib64/android.hardware.keymaster@4.0.so b/recovery/root/vendor/lib64/android.hardware.keymaster@4.0.so
diff --git a/recovery/root/vendor/lib64/android.hardware.keymaster@4.1.so b/recovery/root/vendor/lib64/android.hardware.keymaster@4.1.so
diff --git a/recovery/root/system/lib64/libdmabufheap.so → recovery/root/vendor/lib64/libdmabufheap.so b/recovery/root/system/lib64/libdmabufheap.so → recovery/root/vendor/lib64/libdmabufheap.so
diff --git a/recovery/root/system/lib64/libdrmfs.so → recovery/root/vendor/lib64/libdrmfs.so b/recovery/root/system/lib64/libdrmfs.so → recovery/root/vendor/lib64/libdrmfs.so
diff --git a/recovery/root/system/lib64/libion.so → recovery/root/vendor/lib64/libion.so b/recovery/root/system/lib64/libion.so → recovery/root/vendor/lib64/libion.so
diff --git a/recovery/root/vendor/lib64/libkeymaster4.so b/recovery/root/vendor/lib64/libkeymaster4.so
diff --git a/recovery/root/vendor/lib64/libkeymaster4support.so b/recovery/root/vendor/lib64/libkeymaster4support.so
diff --git a/recovery/root/system/lib64/libkeymint.so → recovery/root/vendor/lib64/libkeymint.so b/recovery/root/system/lib64/libkeymint.so → recovery/root/vendor/lib64/libkeymint.so
diff --git a/...y/root/system/lib64/libkeymint_support.so → ...y/root/vendor/lib64/libkeymint_support.so b/...y/root/system/lib64/libkeymint_support.so → ...y/root/vendor/lib64/libkeymint_support.so
diff --git a/...y/root/system/lib64/libkeystore-engine.so → ...y/root/vendor/lib64/libkeystore-engine.so b/...y/root/system/lib64/libkeystore-engine.so → ...y/root/vendor/lib64/libkeystore-engine.so
diff --git a/...ry/root/system/lib64/libkeystore2_aaid.so → ...ry/root/vendor/lib64/libkeystore2_aaid.so b/...ry/root/system/lib64/libkeystore2_aaid.so → ...ry/root/vendor/lib64/libkeystore2_aaid.so
diff --git a/.../root/system/lib64/libkeystore2_crypto.so → .../root/vendor/lib64/libkeystore2_crypto.so b/.../root/system/lib64/libkeystore2_crypto.so → .../root/vendor/lib64/libkeystore2_crypto.so
diff --git a/...ot/system/lib64/libkeystore2_vintf_cpp.so → ...ot/vendor/lib64/libkeystore2_vintf_cpp.so b/...ot/system/lib64/libkeystore2_vintf_cpp.so → ...ot/vendor/lib64/libkeystore2_vintf_cpp.so
diff --git a/recovery/root/system/lib64/libkeyutils.so → recovery/root/vendor/lib64/libkeyutils.so b/recovery/root/system/lib64/libkeyutils.so → recovery/root/vendor/lib64/libkeyutils.so
diff --git a/...ystem/lib64/libpuresoftkeymasterdevice.so → ...endor/lib64/libpuresoftkeymasterdevice.so b/...ystem/lib64/libpuresoftkeymasterdevice.so → ...endor/lib64/libpuresoftkeymasterdevice.so
diff --git a/vendor.prop b/vendor.prop
@@ -1,7 +1,5 @@
 # Crypto
-ro.crypto.dm_default_key.options_format.version=1
 ro.crypto.volume.filenames_mode=aes-256-cts
-ro.crypto.volume.metadata.method=dm-default-key
 
 # Hardware
 ro.hardware.kmsetkey=beanpod