From 2eb668a3e9dccb9cb784c9e1367458a4255cd55e Mon Sep 17 00:00:00 2001
From: Simon Sickle <simon@simonsickle.com>
Date: Sat, 25 Nov 2017 02:17:51 -0600
Subject: [PATCH] Fix tired derps

Signed-off-by: Simon Sickle <simon@simonsickle.com>
---
 BoardConfig.mk          | 11 +++++------
 cryptfs_hw/Android.mk   |  4 ++--
 cryptfs_hw/cryptfs_hw.c |  2 +-
 cryptfs_hw/cryptfs_hw.h |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 936fd8c..0f3a343 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -23,6 +23,8 @@
 # *not* include it on all devices, so it is safe even with hardware-specific
 # components.
 
+BOARD_PATH := device/oneplus/dumpling
+
 # Architecture
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-a
@@ -70,8 +72,8 @@ TARGET_COPY_OUT_VENDOR := vendor
 
 # Crypto
 TARGET_HW_DISK_ENCRYPTION := true
-TARGET_CRYPTFS_HW_PATH := vendor/qcom/opensource/cryptfs_hw
-TARGET_RECOVERY_DEVICE_MODULES := libcryptfs_hw
+TARGET_CRYPTFS_HW_PATH := $(BOARD_PATH)/cryptfs_hw
+TARGET_KEYMASTER_WAIT_FOR_QSEE := true
 
 # Recovery
 BOARD_HAS_LARGE_FILESYSTEM := true
@@ -93,7 +95,4 @@ TW_INCLUDE_NTFS_3G := true
 TW_INPUT_BLACKLIST := "hbtp_vm"
 TW_EXCLUDE_SUPERSU := true
 TW_SCREEN_BLANK_ON_BOOT := true
-
-# Encryption support
-TW_INCLUDE_CRYPTO := true
-TARGET_KEYMASTER_WAIT_FOR_QSEE := true
+TW_INCLUDE_CRYPTO := true
\ No newline at end of file
diff --git a/cryptfs_hw/Android.mk b/cryptfs_hw/Android.mk
index 8948c80..5b5476f 100644
--- a/cryptfs_hw/Android.mk
+++ b/cryptfs_hw/Android.mk
@@ -2,7 +2,7 @@ ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
+LOCAL_PROPRIETARY_MODULE := true
 
 sourceFiles := \
                cryptfs_hw.c
@@ -31,4 +31,4 @@ LOCAL_CFLAGS += -DUSE_ICE_FOR_STORAGE_ENCRYPTION
 endif
 
 include $(BUILD_SHARED_LIBRARY)
-endif
+endif
\ No newline at end of file
diff --git a/cryptfs_hw/cryptfs_hw.c b/cryptfs_hw/cryptfs_hw.c
index c633e57..e398760 100644
--- a/cryptfs_hw/cryptfs_hw.c
+++ b/cryptfs_hw/cryptfs_hw.c
@@ -281,4 +281,4 @@ int should_use_keymaster()
     }
 
     return 1;
-}
+}
\ No newline at end of file
diff --git a/cryptfs_hw/cryptfs_hw.h b/cryptfs_hw/cryptfs_hw.h
index 9862212..5342c66 100644
--- a/cryptfs_hw/cryptfs_hw.h
+++ b/cryptfs_hw/cryptfs_hw.h
@@ -44,4 +44,4 @@ int should_use_keymaster();
 #ifdef __cplusplus
 }
 #endif
-#endif
+#endif
\ No newline at end of file
-- 
2.20.1