| commit | 7372185739895ba360a09e2bbe514d2cc83ff0e9 | [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:33 2017 +0000 |
| tree | fc4f895559ad76a3f12049eb7ff546ad479bd570 | |
| parent | 20af5c5ed572b0b8d6d4e5dd1cdb1d9ff304f3f9 [diff] | |
| parent | 2590b96be234caf905975560bd45c5586bee3d92 [diff] |
Merge "Revert "libkeymaster1 was split into libkeymaster and _portable""
diff --git a/keymaster/3.0/default/Android.mk b/keymaster/3.0/default/Android.mk index 2dbb200..9df5bf8 100644 --- a/keymaster/3.0/default/Android.mk +++ b/keymaster/3.0/default/Android.mk
@@ -11,8 +11,7 @@ liblog \ libsoftkeymasterdevice \ libcrypto \ - libkeymaster_portable \ - libkeymaster \ + libkeymaster1 \ libhidlbase \ libhidltransport \ libutils \