| commit | ccd9dd53f8a55b296eb0671acefc9f0163fd83b4 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Apr 12 16:44:04 2016 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Apr 12 16:44:04 2016 -0700 |
| tree | c1157401175977c41efac868794fb8514e3dacd8 | |
| parent | 8afff3bfe18320cece8b5601478a34c313a5ad46 [diff] | |
| parent | 81fd991d8bfbc66b43bf22919c87d8b8de6fb008 [diff] |
resolve merge conflicts of 81fd991 to nyc-dev-plus-aosp Change-Id: Iabda2c9ad05ed4aa0a078c5da40b887f36dd9328
diff --git a/Android.mk b/Android.mk index fb5e23e..a0aa0e7 100644 --- a/Android.mk +++ b/Android.mk
@@ -51,6 +51,7 @@ liblogwrap \ libext4_utils \ libf2fs_sparseblock \ + libcrypto_utils \ libcrypto \ libselinux \ libutils \ @@ -66,7 +67,6 @@ libfec_rs \ libsquashfs_utils \ libscrypt_static \ - libmincrypt \ libbatteryservice \ vold_conlyflags := -std=c11