Split libkeymaster1 into libkeymaster and libkeymaster_portable
Also removed unused include
Bug: 37467707
Test: trivial
Merged-In: Ie029462cb79d7aec28a37aac22f04ce73ebac8da
Change-Id: Ie029462cb79d7aec28a37aac22f04ce73ebac8da
(cherry picked from commit 5cc0d5ee603e436643c4f23fab91a0514c2d462d)
diff --git a/keystore/Android.mk b/keystore/Android.mk
index f87675d..e854772 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -57,7 +57,8 @@
libselinux \
libsoftkeymasterdevice \
libkeymaster_messages \
- libkeymaster1 \
+ libkeymaster_portable \
+ libkeymaster \
libhwbinder \
libhidlbase \
libhidltransport \
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>