Merge "Don\'t start defaultcrypto twice" into nyc-dev am: 0264d8f
am: c771d20
* commit 'c771d2086043d7b7d665a18b003937b1e142b7f0':
Change-Id: Iabd62fdefbf3ea43833bc2fdb9364d51a5bba779
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
diff --git a/Utils.cpp b/Utils.cpp
index 7ae22c5..c287797 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -211,7 +211,7 @@
for (auto line : output) {
// Extract values from blkid output, if defined
const char* cline = line.c_str();
- char* start = strstr(cline, "TYPE=");
+ const char* start = strstr(cline, "TYPE=");
if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) {
fsType = value;
}