commit 7069027bc7ce8ff2fd80cc8b38c995288af5d0d3
author Nick Kralevich <nnk@google.com> Wed May 03 00:41:27 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 03 00:41:32 2017 +0000
tree 55f3305a68d5920c157fc779ae18d204662921ca
parent e0267942c66bee3a0236edaf9d66e5d6d06ed622
parent be0ec4f4beb4a4c8a89887b61a7f66c047e33b39

Merge "Revert "Split libkeymaster1 into libkeymaster and libkeymaster_portable""

keystore/Android.mk

diff --git a/keystore/Android.mk b/keystore/Android.mk
index e854772..f87675d 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -57,8 +57,7 @@
 	libselinux \
 	libsoftkeymasterdevice \
 	libkeymaster_messages \
-	libkeymaster_portable \
-	libkeymaster \
+	libkeymaster1 \
 	libhwbinder \
 	libhidlbase \
 	libhidltransport \

keystore/keystore_utils.cpp

diff --git a/keystore/keystore_utils.cpp b/keystore/keystore_utils.cpp
index b1777d0..0d3f0ec 100644
--- a/keystore/keystore_utils.cpp
+++ b/keystore/keystore_utils.cpp
@@ -25,6 +25,7 @@
 #include <cutils/log.h>
 #include <private/android_filesystem_config.h>
 
+#include <keymaster/android_keymaster_utils.h>
 #include <keystore/authorization_set.h>
 #include <keystore/keystore_client.h>
 #include <keystore/IKeystoreService.h>