| commit | bbf68022211d5aff097c59665a6ab2b46808bf5d | [log] [tgz] |
|---|---|---|
| author | Daniel Cardenas <danielcar@google.com> | Thu May 04 22:58:56 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 04 22:59:02 2017 +0000 |
| tree | 47803ec92e1ba2090000ef18d47be4cbed77f181 | |
| parent | 4ecd36a610e9b802b296dc923665355f7cc15fd3 [diff] | |
| parent | d49126d043c85b3768a1baa92a3f9a236e9b4e37 [diff] |
Merge "Rename libkeymaster to libkeymaster_staging"
diff --git a/trusty/keymaster/Android.mk b/trusty/keymaster/Android.mk index 47c17bd..5d2f642 100644 --- a/trusty/keymaster/Android.mk +++ b/trusty/keymaster/Android.mk
@@ -38,7 +38,7 @@ libcrypto \ libcutils \ libkeymaster_portable \ - libkeymaster \ + libkeymaster_staging \ libtrusty \ libkeymaster_messages \ libsoftkeymasterdevice \