use UniquePtr.h from frameworks/native
Use the UniquePtr.h include from frameworks/native/include/utils
to fix the pdk build.
Change-Id: Ic415b43d2eb8c0b7ef54b6f3f75b7fa0d5f7a058
diff --git a/keystore-engine/Android.mk b/keystore-engine/Android.mk
index 989cf9a..89d3fba 100644
--- a/keystore-engine/Android.mk
+++ b/keystore-engine/Android.mk
@@ -27,7 +27,6 @@
LOCAL_CFLAGS := -fvisibility=hidden -Wall -Werror
LOCAL_C_INCLUDES += \
- libcore/include \
system/security/keystore \
external/openssl/include
diff --git a/keystore-engine/eng_keystore.cpp b/keystore-engine/eng_keystore.cpp
index a202641..3514535 100644
--- a/keystore-engine/eng_keystore.cpp
+++ b/keystore-engine/eng_keystore.cpp
@@ -25,7 +25,7 @@
#include <keystore.h>
-#include <UniquePtr.h>
+#include <utils/UniquePtr.h>
#include <sys/socket.h>
#include <stdarg.h>
diff --git a/softkeymaster/Android.mk b/softkeymaster/Android.mk
index 5915208..8623c2e 100644
--- a/softkeymaster/Android.mk
+++ b/softkeymaster/Android.mk
@@ -24,7 +24,6 @@
LOCAL_C_INCLUDES := \
system/security/keystore \
- libcore/include \
external/openssl/include
LOCAL_C_FLAGS = -fvisibility=hidden -Wall -Werror
diff --git a/softkeymaster/keymaster_openssl.cpp b/softkeymaster/keymaster_openssl.cpp
index fb5b9d0..a5ba684 100644
--- a/softkeymaster/keymaster_openssl.cpp
+++ b/softkeymaster/keymaster_openssl.cpp
@@ -28,7 +28,7 @@
#include <openssl/err.h>
#include <openssl/x509.h>
-#include <UniquePtr.h>
+#include <utils/UniquePtr.h>
// For debugging
//#define LOG_NDEBUG 0
