am b33e8873: Add "cryptfs deleteuserkey" command to vold.
* commit 'b33e8873ea78b92e536aa33f48130a91ca150f0c':
Add "cryptfs deleteuserkey" command to vold.
diff --git a/Android.mk b/Android.mk
index 38da8c7..1a4f8dd 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)
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"
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");