From cc1859fc26ca68980cedeedbc7c963e9c046c598 Mon Sep 17 00:00:00 2001 From: Artem Date: Thu, 9 Nov 2017 17:40:05 +0300 Subject: [PATCH 1/2] Update Android.mk --- prebuilt/Android.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index 93ae610bf0..61328ecf4d 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -169,9 +169,6 @@ ifeq ($(TW_INCLUDE_CRYPTO), true) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcrypto.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libhardware.so RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libgpt_twrp.so - ifeq ($(TARGET_HW_DISK_ENCRYPTION),true) - RELINK_SOURCE_FILES += $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/libcryptfs_hw.so - endif # FBE files ifeq ($(TW_INCLUDE_CRYPTO_FBE), true) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libe4crypt.so From cc01541263e6b80f656e81402999864a772ba74c Mon Sep 17 00:00:00 2001 From: Artem Date: Thu, 9 Nov 2017 17:41:38 +0300 Subject: [PATCH 2/2] Update Android.mk --- Android.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Android.mk b/Android.mk index 151be41635..79e88c9167 100644 --- a/Android.mk +++ b/Android.mk @@ -297,6 +297,11 @@ ifeq ($(TW_INCLUDE_L_CRYPTO), true) endif ifeq ($(TW_INCLUDE_CRYPTO), true) LOCAL_CFLAGS += -DTW_INCLUDE_CRYPTO + + ifeq ($(TARGET_HW_DISK_ENCRYPTION),true) + LOCAL_SHARED_LIBRARIES += libcryptfs_hw + endif + LOCAL_SHARED_LIBRARIES += libcryptfslollipop libgpt_twrp LOCAL_C_INCLUDES += external/boringssl/src/include ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 24; echo $$?),0)