From ad05c6dce42ac69fd9a3c04ad3246d7ab3acd7c1 Mon Sep 17 00:00:00 2001 From: maxwen Date: Mon, 1 Aug 2016 22:21:35 +0200 Subject: recovery: allow usage of TARGET_CRYPTFS_HW_PATH only if not defined fallback to the default more flexible device config where the cryptfs_hw is located Change-Id: I7d1c18eeae877e48dceff06a7cfead28c89797b4 --- crypto/lollipop/Android.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/crypto/lollipop/Android.mk b/crypto/lollipop/Android.mk index 16dfd28fd..6dc386a29 100644 --- a/crypto/lollipop/Android.mk +++ b/crypto/lollipop/Android.mk @@ -10,7 +10,11 @@ LOCAL_SHARED_LIBRARIES := libcrypto libhardware libcutils LOCAL_C_INCLUDES := external/openssl/include $(commands_recovery_local_path)/crypto/scrypt/lib/crypto ifeq ($(TARGET_HW_DISK_ENCRYPTION),true) - LOCAL_C_INCLUDES += device/qcom/common/cryptfs_hw + ifeq ($(TARGET_CRYPTFS_HW_PATH),) + LOCAL_C_INCLUDES += device/qcom/common/cryptfs_hw + else + LOCAL_C_INCLUDES += $(TARGET_CRYPTFS_HW_PATH) + endif LOCAL_SHARED_LIBRARIES += libcryptfs_hw LOCAL_CFLAGS += -DCONFIG_HW_DISK_ENCRYPTION endif @@ -36,7 +40,11 @@ LOCAL_SHARED_LIBRARIES := libcrypto libhardware libcutils libc LOCAL_C_INCLUDES := external/openssl/include $(commands_recovery_local_path)/crypto/scrypt/lib/crypto ifeq ($(TARGET_HW_DISK_ENCRYPTION),true) - LOCAL_C_INCLUDES += device/qcom/common/cryptfs_hw + ifeq ($(TARGET_CRYPTFS_HW_PATH),) + LOCAL_C_INCLUDES += device/qcom/common/cryptfs_hw + else + LOCAL_C_INCLUDES += $(TARGET_CRYPTFS_HW_PATH) + endif LOCAL_SHARED_LIBRARIES += libcryptfs_hw LOCAL_CFLAGS += -DCONFIG_HW_DISK_ENCRYPTION endif -- cgit v1.2.3