| commit | 8e84a737877f08e0bc051d5ef0c71f134e97adb1 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Wed May 03 00:41:27 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 03 00:41:32 2017 +0000 |
| tree | 8a9a8d1aa996e10876243766a78bc6aad3f66583 | |
| parent | 9879d11860bdced9da71a5b80065220cbbfb4ee9 [diff] | |
| parent | 8a0f637d418f23a732382b8989dc14eaad68e372 [diff] |
Merge "Revert "libkeymaster1 split""
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 \