commit ea3b820b93f2059360804eab119d309945250fd9
author Janis Danisevskis <jdanis@google.com> Wed Apr 26 14:19:51 2017 -0700
committer Janis Danisevskis <jdanis@google.com> Mon May 01 12:34:46 2017 -0700
tree 08174b329dbc3cce261fe58a6553e197dfb2e1b2
parent ccfff10f66d568b91ed155a798c5eaac2551f160

Split libkeymaster1 into libkeymaster and libkeymaster_portable

Also removed unused include

Test: trivial
Change-Id: I37122aead5b60be8dd0697afa22489532d314b9c

keystore/Android.mk

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

keystore/keystore_utils.cpp

diff --git a/keystore/keystore_utils.cpp b/keystore/keystore_utils.cpp
index 0d3f0ec..b1777d0 100644
--- a/keystore/keystore_utils.cpp
+++ b/keystore/keystore_utils.cpp
@@ -25,7 +25,6 @@
 #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>