From 8a0f637d418f23a732382b8989dc14eaad68e372 Mon Sep 17 00:00:00 2001 From: Janis Danisevskis Date: Wed, 3 May 2017 00:22:39 +0000 Subject: [PATCH] Revert "libkeymaster1 split" This reverts commit c5bb8c74d1265d4bd8827e66f884c72e7e1d896b. Reason for revert: build breakage Change-Id: I892346eec4a4628da893b0cd4182c8f546beb60a --- trusty/keymaster/Android.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/trusty/keymaster/Android.mk b/trusty/keymaster/Android.mk index 47c17bda7..2d614aec6 100644 --- 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 \