Reorganize system/keymaster.
This CL moves the includes that should be exported to include/ and
removes the trusty-specific code (some of which is moving to
hardware/google and some of which is moving to the trusty tree.)
Change-Id: Ie4fabf6b5c5f36b50c2f5ff356548ca2e9140fcb
diff --git a/google_keymaster_test_utils.h b/google_keymaster_test_utils.h
index 17786de..8413951 100644
--- a/google_keymaster_test_utils.h
+++ b/google_keymaster_test_utils.h
@@ -25,9 +25,9 @@
#include <ostream>
-#include "authorization_set.h"
-#include "keymaster_defs.h"
-#include "logger.h"
+#include <keymaster/authorization_set.h>
+#include <keymaster/keymaster_defs.h>
+#include <keymaster/logger.h>
std::ostream& operator<<(std::ostream& os, const keymaster_key_param_t& param);
bool operator==(const keymaster_key_param_t& a, const keymaster_key_param_t& b);
@@ -40,7 +40,6 @@
namespace test {
-
template <keymaster_tag_t Tag, typename KeymasterEnum>
bool contains(const AuthorizationSet& set, TypedEnumTag<KM_ENUM, Tag, KeymasterEnum> tag,
KeymasterEnum val) {