commit eedcfe96d1b4517eb5201a8557aedc00d806c88a
author Shawn Willden <swillden@google.com> Thu Jan 18 15:35:46 2018 -0700
committer Shawn Willden <swillden@google.com> Thu Jan 18 15:38:55 2018 -0700
tree 0602f3045e6a978fe8ef46d917f9fff570a82048
parent 64b967b99b49efacd5f849354a42771ef1cb5a29

Move Keymaster wrappers to the KM4 support lib

Test: CTS
Change-Id: Id84de1d4bcc9643ffa24a678ad5d0d2385baec5e

keystore/KeyStore.h

diff --git a/keystore/KeyStore.h b/keystore/KeyStore.h
index cfc5c31..23476d2 100644
--- a/keystore/KeyStore.h
+++ b/keystore/KeyStore.h
@@ -18,12 +18,11 @@
 #define KEYSTORE_KEYSTORE_H_
 
 #include <android/hardware/keymaster/3.0/IKeymasterDevice.h>
-
+#include <keymasterV4_0/Keymaster.h>
 #include <utils/Vector.h>
 
 #include <keystore/keymaster_types.h>
 
-#include "Keymaster.h"
 #include "blob.h"
 #include "grant_store.h"
 #include "user_state.h"
@@ -31,6 +30,7 @@
 namespace keystore {
 
 using ::android::sp;
+using keymaster::support::Keymaster;
 
 class KeymasterDevices : public std::array<sp<Keymaster>, 3> {
   public: