commit bb22a6c50d609dffc7002f906f4d385d7c7cbfdc
author Shawn Willden <swillden@google.com> Wed Dec 06 19:35:28 2017 -0700
committer Janis Danisevskis <jdanis@google.com> Wed Dec 27 09:24:19 2017 -0800
tree 6be3fc97010ed92c84e68066e914dd28df26ab54
parent 2e0282a08da498711e9ff89517465f15d262c23b

Use libkeymaster4support in keystore.

Test: CTS
Change-Id: Iee8f308a5255a03b02fce162cc4184d45f75fd1b

keystore/keystore_main.cpp

diff --git a/keystore/keystore_main.cpp b/keystore/keystore_main.cpp
index f4ccf04..56fe0d5 100644
--- a/keystore/keystore_main.cpp
+++ b/keystore/keystore_main.cpp
@@ -15,21 +15,23 @@
  */
 
 #include <android-base/logging.h>
+#include <android/security/IKeystoreService.h>
 #include <android/system/wifi/keystore/1.0/IKeystore.h>
 #include <binder/IPCThreadState.h>
 #include <binder/IServiceManager.h>
+#include <hidl/HidlTransportSupport.h>
 #include <utils/StrongPointer.h>
 #include <wifikeystorehal/keystore.h>
 
+#include <keystore/keystore_hidl_support.h>
+#include <keystore/keystore_return_types.h>
+
 #include "KeyStore.h"
 #include "Keymaster3.h"
 #include "entropy.h"
-#include "include/keystore/keystore_hidl_support.h"
-#include "include/keystore/keystore_return_types.h"
 #include "key_store_service.h"
 #include "legacy_keymaster_device_wrapper.h"
 #include "permissions.h"
-#include <android/security/IKeystoreService.h>
 
 /* KeyStore is a secured storage for key-value pairs. In this implementation,
  * each file stores one key-value pair. Keys are encoded in file names, and