Revert "libkeymaster1 split"

This reverts commit c5bb8c74d1. Reason for revert: build breakage Change-Id: I892346eec4a4628da893b0cd4182c8f546beb60a
2017-05-03 00:22:39 +00:00 · 2017-05-03 00:22:39 +00:00 · 8a0f637d41
parent c5bb8c74d1
commit 8a0f637d41
1 changed files with 1 additions and 2 deletions
--- a/trusty/keymaster/Android.mk
+++ b/trusty/keymaster/Android.mk
@ -37,8 +37,7 @@ LOCAL_SRC_FILES := \
 LOCAL_SHARED_LIBRARIES := \
 	libcrypto \
 	libcutils \
-	libkeymaster_portable \
-	libkeymaster \
+	libkeymaster1 \
 	libtrusty \
 	libkeymaster_messages \
 	libsoftkeymasterdevice \