libkeymaster: Fix UniquePtr dependency

Change-Id: I1d354461f5114e4f01b0b4899286845136320264
Signed-off-by: Lunarixus <Nathanb644@hotmail.co.uk>

diff --git a/libkeymaster/Android.mk b/libkeymaster/Android.mk
index 6f22471cd13d8bd6616fa6d5d1179191ff1bbad5..ffff40c6c4b0fce074784f638b07b6fd60d7a872 100644 (file)
--- 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 \
 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
 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 b056d07c5ffb5cc5118ef3fc45a8e1dc23e1d8c5..db29a0c54588b2613d6f61193eb229a94d455e30 100644 (file)
--- a/libkeymaster/keymaster_mobicore.cpp
+++ b/libkeymaster/keymaster_mobicore.cpp
@@ -28,7 +28,7 @@
 #include <openssl/err.h>
 #include <openssl/x509.h>
 
 #include <openssl/err.h>
 #include <openssl/x509.h>
 

-#include <nativehelper/UniquePtr.h>
+#include <keymaster/UniquePtr.h>

 
 #define LOG_TAG "ExynosKeyMaster"
 #include <cutils/log.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)
 
 #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);
 struct BIGNUM_Delete {
     void operator()(BIGNUM* p) const {
         BN_free(p);