commit be0ec4f4beb4a4c8a89887b61a7f66c047e33b39
author Janis Danisevskis <jdanis@google.com> Wed May 03 00:23:24 2017 +0000
committer Janis Danisevskis <jdanis@google.com> Wed May 03 00:23:24 2017 +0000
tree 741401fde3e543ef31ef61bd2bc66fe57a56dbc5
parent ea3b820b93f2059360804eab119d309945250fd9

Revert "Split libkeymaster1 into libkeymaster and libkeymaster_portable"

This reverts commit ea3b820b93f2059360804eab119d309945250fd9.

Reason for revert: build breakage

Change-Id: Ib101a5e896ffa816a7b9fb46774113846fa82590

keystore/Android.mk

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