summaryrefslogtreecommitdiffstats
path: root/tests/keymaster
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2012-03-22 16:33:37 -0700
committerKenny Root <kroot@google.com>2012-03-22 16:33:37 -0700
commitcaf62bd7fb288be42d207d88d1fd282de79aa085 (patch)
treec8549d64f053e07a7c20c53145d512afac3933ac /tests/keymaster
parentdaacbf40167040991382009523cb29a60b02abf2 (diff)
downloadhardware_libhardware-caf62bd7fb288be42d207d88d1fd282de79aa085.tar.gz
hardware_libhardware-caf62bd7fb288be42d207d88d1fd282de79aa085.tar.bz2
hardware_libhardware-caf62bd7fb288be42d207d88d1fd282de79aa085.zip
Use frameworks/native copy of UniquePtr.h
Change-Id: Idfe46c057699b5f019f84e588bb8a9697e48236c
Diffstat (limited to 'tests/keymaster')
-rw-r--r--tests/keymaster/Android.mk1
-rw-r--r--tests/keymaster/keymaster_test.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/keymaster/Android.mk b/tests/keymaster/Android.mk
index cd76754..2661211 100644
--- a/tests/keymaster/Android.mk
+++ b/tests/keymaster/Android.mk
@@ -9,7 +9,6 @@ LOCAL_SRC_FILES:= \
# Note that "bionic" is needed because of stlport
LOCAL_C_INCLUDES := \
bionic \
- libcore/include \
external/gtest/include \
external/stlport/stlport
diff --git a/tests/keymaster/keymaster_test.cpp b/tests/keymaster/keymaster_test.cpp
index 383aeb5..98e9407 100644
--- a/tests/keymaster/keymaster_test.cpp
+++ b/tests/keymaster/keymaster_test.cpp
@@ -16,6 +16,7 @@
#define LOG_TAG "keymaster_test"
#include <utils/Log.h>
+#include <utils/UniquePtr.h>
#include <hardware/keymaster.h>
@@ -23,7 +24,6 @@
#include <fstream>
#include <iostream>
-#include <UniquePtr.h>
namespace android {