commit 8a0f637d418f23a732382b8989dc14eaad68e372
author Janis Danisevskis <jdanis@google.com> Wed May 03 00:22:39 2017 +0000
committer Janis Danisevskis <jdanis@google.com> Wed May 03 00:22:39 2017 +0000
tree d92a90c7cfe209dac9c2903bfc21f97260e1bdcc
parent c5bb8c74d1265d4bd8827e66f884c72e7e1d896b

Revert "libkeymaster1 split"

This reverts commit c5bb8c74d1265d4bd8827e66f884c72e7e1d896b.

Reason for revert: build breakage

Change-Id: I892346eec4a4628da893b0cd4182c8f546beb60a

trusty/keymaster/Android.mk

diff --git a/trusty/keymaster/Android.mk b/trusty/keymaster/Android.mk
index 47c17bd..2d614ae 100644
--- a/trusty/keymaster/Android.mk
+++ b/trusty/keymaster/Android.mk
@@ -37,8 +37,7 @@
 LOCAL_SHARED_LIBRARIES := \
 	libcrypto \
 	libcutils \
-	libkeymaster_portable \
-	libkeymaster \
+	libkeymaster1 \
 	libtrusty \
 	libkeymaster_messages \
 	libsoftkeymasterdevice \