commit 0bdad21c560552ec324733fb5db734fec204a2e9
author Shawn Willden <swillden@google.com> Mon May 18 21:08:39 2015 -0600
committer Shawn Willden <swillden@google.com> Mon May 18 21:10:45 2015 -0600
tree ae8d231fedc89e38d32048409677c175f54adb62
parent c0f031a867a6c3fa05732fcd72bd284d56073cf8

Remove references to Google in Android keymaster.

Also, remove unneeded inclusion of key_blob.h.

Change-Id: I05de61353fc806b90232fab7c1d1cf76aefa35fc

keystore/auth_token_table.cpp

diff --git a/keystore/auth_token_table.cpp b/keystore/auth_token_table.cpp
index de5d41d..98731b3 100644
--- a/keystore/auth_token_table.cpp
+++ b/keystore/auth_token_table.cpp
@@ -21,7 +21,7 @@
 
 #include <algorithm>
 
-#include <keymaster/google_keymaster_utils.h>
+#include <keymaster/android_keymaster_utils.h>
 #include <keymaster/logger.h>
 
 namespace keymaster {

keystore/auth_token_table.h

diff --git a/keystore/auth_token_table.h b/keystore/auth_token_table.h
index 7a9cc34..a63e2d8 100644
--- a/keystore/auth_token_table.h
+++ b/keystore/auth_token_table.h
@@ -19,7 +19,6 @@
 
 #include <hardware/hw_auth_token.h>
 #include <keymaster/authorization_set.h>
-#include <keymaster/key_blob.h>
 
 #ifndef SYSTEM_KEYMASTER_AUTH_TOKEN_TABLE_H
 #define SYSTEM_KEYMASTER_AUTH_TOKEN_TABLE_H

keystore/tests/auth_token_table_test.cpp

diff --git a/keystore/tests/auth_token_table_test.cpp b/keystore/tests/auth_token_table_test.cpp
index fec7e43..b1c0f49 100644
--- a/keystore/tests/auth_token_table_test.cpp
+++ b/keystore/tests/auth_token_table_test.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include <keymaster/google_keymaster_utils.h>
+#include <keymaster/android_keymaster_utils.h>
 #include <keymaster/logger.h>
 
 #include "../auth_token_table.h"