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/libtar/Android.mk b/libtar/Android.mk
index 9b051e6..9209da9 100755
--- a/libtar/Android.mk
+++ b/libtar/Android.mk
@@ -14,15 +14,9 @@
LOCAL_SHARED_LIBRARIES += libselinux
ifeq ($(TW_INCLUDE_CRYPTO_FBE), true)
- ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 29; echo $$?),0)
- LOCAL_SHARED_LIBRARIES += libtwrpfscrypt
- LOCAL_CFLAGS += -DUSE_FSCRYPT
- LOCAL_C_INCLUDES += $(LOCAL_PATH)/../crypto/fscrypt
- else
- LOCAL_SHARED_LIBRARIES += libe4crypt
- LOCAL_CFLAGS += -DHAVE_EXT4_CRYPT
- LOCAL_C_INCLUDES += $(LOCAL_PATH)/../crypto/ext4crypt
- endif
+ LOCAL_SHARED_LIBRARIES += libtwrpfscrypt
+ LOCAL_CFLAGS += -DUSE_FSCRYPT
+ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../crypto/fscrypt
endif
ifeq ($(TW_LIBTAR_DEBUG),true)
@@ -45,15 +39,9 @@
LOCAL_STATIC_LIBRARIES += libselinux
ifeq ($(TW_INCLUDE_CRYPTO_FBE), true)
- ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 29; echo $$?),0)
- LOCAL_SHARED_LIBRARIES += libtwrpfscrypt
- LOCAL_CFLAGS += -DUSE_FSCRYPT
- LOCAL_C_INCLUDES += $(LOCAL_PATH)/../crypto/fscrypt
- else
- LOCAL_SHARED_LIBRARIES += libe4crypt
- LOCAL_CFLAGS += -DHAVE_EXT4_CRYPT
- LOCAL_C_INCLUDES += $(LOCAL_PATH)/../crypto/ext4crypt
- endif
+ LOCAL_SHARED_LIBRARIES += libtwrpfscrypt
+ LOCAL_CFLAGS += -DUSE_FSCRYPT
+ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../crypto/fscrypt
endif
ifeq ($(TW_LIBTAR_DEBUG),true)