From ff35fa7ff87d5890482c45c7034d0e71a722702f Mon Sep 17 00:00:00 2001
From: Simon Sickle <simon@simonsickle.com>
Date: Sat, 25 Nov 2017 02:52:14 -0600
Subject: [PATCH] the real deal

Signed-off-by: Simon Sickle <simon@simonsickle.com>
---
 AndroidBoard.mk => Android.mk | 12 +++++++++---
 cryptfs_hw/Android.mk         |  2 ++
 2 files changed, 11 insertions(+), 3 deletions(-)
 rename AndroidBoard.mk => Android.mk (90%)

diff --git a/AndroidBoard.mk b/Android.mk
similarity index 90%
rename from AndroidBoard.mk
rename to Android.mk
index bdb9a5b..3e8b26c 100644
--- a/AndroidBoard.mk
+++ b/Android.mk
@@ -1,5 +1,5 @@
 #
-# Copyright 2016 The Android Open Source Project
+# Copyright (C) 2016 The CyanogenMod Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+#
 # This contains the module build definitions for the hardware-specific
 # components for this device.
 #
@@ -22,9 +23,14 @@
 # bitrot and build breakages. Building a component unconditionally does
 # *not* include it on all devices, so it is safe even with hardware-specific
 # components.
+#
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter dumpling,$(TARGET_DEVICE)),)
+ifeq ($(TARGET_DEVICE),dumpling)
+
 include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
+
+include $(CLEAR_VARS)
+
+endif
\ No newline at end of file
diff --git a/cryptfs_hw/Android.mk b/cryptfs_hw/Android.mk
index 5b5476f..0054cb5 100644
--- a/cryptfs_hw/Android.mk
+++ b/cryptfs_hw/Android.mk
@@ -20,6 +20,8 @@ LOCAL_SRC_FILES := $(sourceFiles)
 
 LOCAL_MODULE_TAGS       := optional
 LOCAL_MODULE:= libcryptfs_hw
+LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
+LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
 LOCAL_SHARED_LIBRARIES := $(commonSharedLibraries)
 
 LOCAL_MODULE_OWNER := qcom
-- 
2.20.1