commit dc864ec8acde6d384a7a402ee071895f12ef1910
author Dees Troy <dees_troy@teamw.in> Tue Nov 28 15:04:30 2017 +0100
committer Gerrit Code Review <gerrit2@gerrit.omnirom.org> Tue Nov 28 15:04:30 2017 +0100
tree ea7a6b02bf02cf8e6e4e31ff14d773814001706f
parent dcd9f3f384f9497916118173ece71cd258cab876
parent 6e8c27a52b67e3474936113f897f309a0091910a

Merge "Support v2 fstab format" into android-8.0

prebuilt/Android.mk

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index f03c667..aff20d5 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -170,7 +170,11 @@
     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
+        ifeq ($(TARGET_CRYPTFS_HW_PATH),)
+            RELINK_SOURCE_FILES += $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/libcryptfs_hw.so
+        else
+            RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcryptfs_hw.so
+        endif
     endif
     # FBE files
     ifeq ($(TW_INCLUDE_CRYPTO_FBE), true)