commit 98c2f8fcc1263a9d94adac66994fffc96c0df699
author Colin Cross <ccross@android.com> Wed Mar 28 09:44:09 2012 -0700
committer Colin Cross <ccross@android.com> Wed Mar 28 09:44:58 2012 -0700
tree 3c41b752cb897a329455b07156c9bb5b8cee8551
parent 822c3a99d930e9299e2fad2fb3e0ff91b119b95a

use UniquePtr.h from frameworks/native

Use the UniquePtr.h include from frameworks/native/include/utils
to fix the pdk build.

Change-Id: Ic415b43d2eb8c0b7ef54b6f3f75b7fa0d5f7a058

softkeymaster/Android.mk

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

softkeymaster/keymaster_openssl.cpp

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