| commit | af458c478a9f333fa39bdddb9a7aa097a2196b64 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Apr 12 23:12:35 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Apr 12 23:12:35 2016 +0000 |
| tree | 7e2eb1197f785ee7e7091de872b7ecfca06c6b5d | |
| parent | a4f7dadd389e25d2b5749d1edf65081b3a4e6961 [diff] | |
| parent | dc8032396916db58a136d73bf5e587419507db4e [diff] |
Merge "Switch to BoringSSL crypto."
diff --git a/Android.mk b/Android.mk index c9ac277..66b8a63 100644 --- a/Android.mk +++ b/Android.mk
@@ -48,6 +48,7 @@ liblogwrap \ libext4_utils \ libf2fs_sparseblock \ + libcrypto_utils \ libcrypto \ libselinux \ libutils \ @@ -61,7 +62,6 @@ libfec_rs \ libsquashfs_utils \ libscrypt_static \ - libmincrypt \ libbatteryservice vold_conlyflags := -std=c11