fscrypt: move fscrypt to android_system_vold
Change-Id: I2cb7385541b8d9c7f1d8de0cef8ed3803b457b8c
diff --git a/Android.mk b/Android.mk
index c2f1f59..61cec06 100755
--- a/Android.mk
+++ b/Android.mk
@@ -90,6 +90,7 @@
system/gsid/include/ \
system/core/init/ \
system/extras/ext4_utils/include \
+ system/vold
ifneq ($(TARGET_RECOVERY_REBOOT_SRC),)
LOCAL_SRC_FILES += $(TARGET_RECOVERY_REBOOT_SRC)
@@ -108,6 +109,7 @@
system/extras \
packages/modules/adb \
system/core/libsparse \
+ system/vold \
external/zlib \
system/libziparchive/include \
external/freetype/include \
@@ -127,7 +129,7 @@
$(LOCAL_PATH)/minuitwrp/include \
$(LOCAL_PATH)/twinstall/include
-LOCAL_STATIC_LIBRARIES += libguitwrp
+LOCAL_STATIC_LIBRARIES += libguitwrp libvold
LOCAL_SHARED_LIBRARIES += libz libc libcutils libstdc++ libtar libblkid libminuitwrp libmtdutils libtwadbbu
LOCAL_SHARED_LIBRARIES += libbootloader_message libcrecovery libtwrpdigest libc++ libaosprecovery libcrypto libbase
LOCAL_SHARED_LIBRARIES += libziparchive libselinux libdl_android.bootstrap
@@ -296,12 +298,6 @@
ifeq ($(TW_NO_HAPTICS), true)
LOCAL_CFLAGS += -DTW_NO_HAPTICS
endif
-ifeq ($(TW_INCLUDE_JB_CRYPTO), true)
- TW_INCLUDE_CRYPTO := true
-endif
-ifeq ($(TW_INCLUDE_L_CRYPTO), true)
- TW_INCLUDE_CRYPTO := true
-endif
ifneq ($(TW_ADDITIONAL_APEX_FILES),)
LOCAL_CFLAGS += -DTW_ADDITIONAL_APEX_FILES=$(TW_ADDITIONAL_APEX_FILES)
endif
@@ -313,14 +309,27 @@
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 libstatssocket.recovery
+ LOCAL_SHARED_LIBRARIES += libgpt_twrp
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 \
- android.hardware.oemlock@1.0
+ LOCAL_SHARED_LIBRARIES += android.frameworks.stats@1.0 android.hardware.authsecret@1.0 \
+ android.security.authorization-ndk_platform \
+ android.hardware.oemlock@1.0 libf2fs_sparseblock libbinder libbinder_ndk \
+ libandroidicu.recovery \
+ android.hardware.gatekeeper@1.0 \
+ android.hardware.weaver@1.0 \
+ android.frameworks.stats@1.0 \
+ android.security.maintenance-ndk_platform \
+ android.system.keystore2-V1-ndk_platform \
+ libkeyutils \
+ liblog \
+ libsqlite.recovery \
+ libkeystoreinfo.recovery \
+ libgatekeeper_aidl
+
+ LOCAL_STATIC_LIBRARIES += libkeymint_support
+
LOCAL_CFLAGS += -DTW_INCLUDE_FBE_METADATA_DECRYPT
ifneq ($(TW_CRYPTO_USE_SYSTEM_VOLD),)
ifneq ($(TW_CRYPTO_USE_SYSTEM_VOLD),false)
@@ -507,7 +516,13 @@
TWRP_REQUIRED_MODULES += \
vold_prepare_subdirs \
task_recovery_profiles.json \
- fscryptpolicyget
+ fscryptpolicyget.recovery \
+ keystore_auth \
+ keystore2 \
+ android.system.keystore2-service.xml \
+ keystore2.rc \
+ plat_keystore2_key_contexts
+
ifneq ($(TW_INCLUDE_CRYPTO_FBE),)
TWRP_REQUIRED_MODULES += \
plat_service_contexts \
@@ -707,11 +722,8 @@
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
- endif
ifneq ($(TW_CRYPTO_USE_SYSTEM_VOLD),)
ifneq ($(TW_CRYPTO_USE_SYSTEM_VOLD),false)
include $(commands_TWRP_local_path)/crypto/vold_decrypt/Android.mk