commit 1902986419014d8bfa0ad609a7d5caa773e2b2cc
author dianlujitao <dianlujitao@lineageos.org> Fri Feb 24 15:32:57 2017 +0800
committer Nick Reuter <nreuter85@gmail.com> Sat Jun 10 17:59:33 2017 -0500
tree 5fe8b07cc132b3de98bb7b1ccfc06dcf46525a7f
parent 138cdcce6d5d50cc5d43be8d747ba4031394f79a

Fix for LineageOS build

 * Match LineageOS cryptfs_hw location
 * Fallback to toybox if busybox is not persent, and warn about this

Change-Id: I5bc1399602f59f4d22827ff7e47acb901b1e33c6

crypto/lollipop/Android.mk

diff --git a/crypto/lollipop/Android.mk b/crypto/lollipop/Android.mk
index 6dc386a..8c2d5a0 100644
--- a/crypto/lollipop/Android.mk
+++ b/crypto/lollipop/Android.mk
@@ -10,11 +10,7 @@
 LOCAL_C_INCLUDES := external/openssl/include $(commands_recovery_local_path)/crypto/scrypt/lib/crypto
 
 ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
-    ifeq ($(TARGET_CRYPTFS_HW_PATH),)
-        LOCAL_C_INCLUDES += device/qcom/common/cryptfs_hw
-    else
-        LOCAL_C_INCLUDES += $(TARGET_CRYPTFS_HW_PATH)
-    endif
+    LOCAL_C_INCLUDES += $(TARGET_CRYPTFS_HW_PATH)
     LOCAL_SHARED_LIBRARIES += libcryptfs_hw
     LOCAL_CFLAGS += -DCONFIG_HW_DISK_ENCRYPTION
 endif
@@ -40,11 +36,7 @@
 LOCAL_C_INCLUDES := external/openssl/include $(commands_recovery_local_path)/crypto/scrypt/lib/crypto
 
 ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
-    ifeq ($(TARGET_CRYPTFS_HW_PATH),)
-        LOCAL_C_INCLUDES += device/qcom/common/cryptfs_hw
-    else
-        LOCAL_C_INCLUDES += $(TARGET_CRYPTFS_HW_PATH)
-    endif
+    LOCAL_C_INCLUDES += $(TARGET_CRYPTFS_HW_PATH)
     LOCAL_SHARED_LIBRARIES += libcryptfs_hw
     LOCAL_CFLAGS += -DCONFIG_HW_DISK_ENCRYPTION
 endif