From 491b09afe341b9ed33d2489608c8d3c570c179ce Mon Sep 17 00:00:00 2001
From: Lunarixus <Nathanb644@hotmail.co.uk>
Date: Fri, 17 Apr 2020 18:49:00 +0000
Subject: [PATCH] libkeymaster: Fix UniquePtr dependency

Change-Id: I1d354461f5114e4f01b0b4899286845136320264
Signed-off-by: Lunarixus <Nathanb644@hotmail.co.uk>
---
 libkeymaster/Android.mk             | 3 ++-
 libkeymaster/keymaster_mobicore.cpp | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libkeymaster/Android.mk b/libkeymaster/Android.mk
index 6f22471..ffff40c 100644
--- a/libkeymaster/Android.mk
+++ b/libkeymaster/Android.mk
@@ -24,7 +24,8 @@ LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_SRC_FILES := keymaster_mobicore.cpp tlcTeeKeymaster_if.c
 LOCAL_C_INCLUDES := \
 	$(MOBICORE_PATH)/daemon/ClientLib/public \
-	$(MOBICORE_PATH)/common/MobiCore/inc/
+	$(MOBICORE_PATH)/common/MobiCore/inc/ \
+        system/keymaster/include
 LOCAL_C_FLAGS = -fvisibility=hidden -Wall -Werror
 LOCAL_SHARED_LIBRARIES := libcrypto liblog libMcClient libnativehelper
 LOCAL_MODULE_TAGS := optional
diff --git a/libkeymaster/keymaster_mobicore.cpp b/libkeymaster/keymaster_mobicore.cpp
index b056d07..db29a0c 100644
--- a/libkeymaster/keymaster_mobicore.cpp
+++ b/libkeymaster/keymaster_mobicore.cpp
@@ -28,7 +28,7 @@
 #include <openssl/err.h>
 #include <openssl/x509.h>
 
-#include <nativehelper/UniquePtr.h>
+#include <keymaster/UniquePtr.h>
 
 #define LOG_TAG "ExynosKeyMaster"
 #include <cutils/log.h>
@@ -38,6 +38,8 @@
 #define RSA_KEY_BUFFER_SIZE   1536
 #define RSA_KEY_MAX_SIZE      (2048 >> 3)
 
+using keymaster::UniquePtr;
+
 struct BIGNUM_Delete {
     void operator()(BIGNUM* p) const {
         BN_free(p);
-- 
2.20.1