FsCrypt update: support fscrypt policies v1 and v2
This patchset introduces support decryption for Android 11.
In this update we deprecate ext4crypt. To specify the
policy version to use, use TW_USE_FSCRYPT_POLICY := 1 or
TW_USE_FSCRYPT_POLICY := 2. By default policy version will
be set to 2 if this variable is omitted.
Change-Id: I62a29c1bef36c259ec4b11259f71be613d20a112
diff --git a/Android.mk b/Android.mk
index ed63d54..038daaa 100755
--- a/Android.mk
+++ b/Android.mk
@@ -100,7 +100,6 @@
LOCAL_C_INCLUDES += \
bionic \
- system/vold \
system/extras \
system/core/adb \
system/core/libsparse \
@@ -287,10 +286,10 @@
endif
ifeq ($(TW_INCLUDE_CRYPTO), true)
LOCAL_CFLAGS += -DTW_INCLUDE_CRYPTO -DUSE_FSCRYPT -Wno-macro-redefined
- # LOCAL_SHARED_LIBRARIES += libcryptfsfde
- LOCAL_SHARED_LIBRARIES += libgpt_twrp
- LOCAL_C_INCLUDES += external/boringssl/src/include bootable/recovery/crypto/fscrypt \
- bootable/recovery/crypto
+ LOCAL_SHARED_LIBRARIES += libcryptfsfde
+ LOCAL_SHARED_LIBRARIES += libgpt_twrp libstatssocket.recovery
+ LOCAL_C_INCLUDES += external/boringssl/src/include bootable/recovery/crypto
+ LOCAL_C_INCLUDES += $(commands_TWRP_local_path)/crypto/fscrypt
TW_INCLUDE_CRYPTO_FBE := true
LOCAL_CFLAGS += -DTW_INCLUDE_FBE
LOCAL_SHARED_LIBRARIES += libtwrpfscrypt android.frameworks.stats@1.0 android.hardware.authsecret@1.0 \
@@ -375,6 +374,8 @@
LOCAL_CFLAGS += -DTW_EXCLUDE_NANO
endif
+LOCAL_C_INCLUDES += system/vold \
+
TWRP_REQUIRED_MODULES += \
relink_libraries \
relink_binaries \
@@ -638,7 +639,7 @@
endif
ifeq ($(TW_INCLUDE_CRYPTO), true)
- # include $(commands_TWRP_local_path)/crypto/fde/Android.mk
+ include $(commands_TWRP_local_path)/crypto/fde/Android.mk
include $(commands_TWRP_local_path)/crypto/scrypt/Android.mk
ifeq ($(TW_INCLUDE_CRYPTO_FBE), true)
include $(commands_TWRP_local_path)/crypto/fscrypt/Android.mk