commit 0c4ce9b030a8e72ca4c5c8580183bc0e94896a1b
author Jeff Sharkey <jsharkey@android.com> Thu Aug 13 00:15:51 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 13 00:15:51 2015 +0000
tree 3a450d6f123b76f0d04976a4505fb93b92526139
parent 47f0531ec9adf7a29873ccdb11a1ee7b11e76c80
parent 008c1ac225c1ca29f38b57203d82a63f6f85b865

am 008c1ac2: am eddf9bd6: Request specific tags from blkid.

* commit '008c1ac225c1ca29f38b57203d82a63f6f85b865':
  Request specific tags from blkid.

Android.mk

diff --git a/Android.mk b/Android.mk
index 1d36312..ea2f138 100644
--- a/Android.mk
+++ b/Android.mk
@@ -52,7 +52,7 @@
 	libutils \
 	libhardware \
 	libsoftkeymaster \
-	libbase \
+	libbase
 
 common_static_libraries := \
 	libfs_mgr \
@@ -107,7 +107,7 @@
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_CLANG := true
-LOCAL_SRC_FILES:= vdc.c
+LOCAL_SRC_FILES:= vdc.cpp
 LOCAL_MODULE:= vdc
 LOCAL_SHARED_LIBRARIES := libcutils
 LOCAL_CFLAGS := $(vold_cflags)

CommandListener.cpp

diff --git a/CommandListener.cpp b/CommandListener.cpp
index 36d2950..a9a8031 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -44,6 +44,7 @@
 #include "Process.h"
 #include "Loop.h"
 #include "Devmapper.h"
+#include "Ext4Crypt.h"
 #include "cryptfs.h"
 #include "MoveTask.h"
 #include "TrimTask.h"

vdc.cpp

diff --git a/vdc.c b/vdc.cpp
similarity index 98%
rename from vdc.c
rename to vdc.cpp
index c6b2c92..d8476b7 100644
--- a/vdc.c
+++ b/vdc.cpp
@@ -106,7 +106,7 @@
 }
 
 static int do_monitor(int sock, int stop_after_cmd) {
-    char *buffer = malloc(4096);
+    char *buffer = (char *) malloc(4096);
 
     if (!stop_after_cmd)
         printf("[Connected to Vold]\n");