auto import from //branches/cupcake/...@130745
diff --git a/vold/Android.mk b/vold/Android.mk
index 465849f..3dd9f87 100644
--- a/vold/Android.mk
+++ b/vold/Android.mk
@@ -1,7 +1,3 @@
-BUILD_VOLD := false
-
-ifeq ($(BUILD_VOLD),true)
-
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -10,7 +6,6 @@
vold.c \
cmd_dispatch.c \
uevent.c \
- inotify.c \
mmc.c \
misc.c \
blkdev.c \
@@ -22,6 +17,9 @@
volmgr_ext3.c \
logwrapper.c \
ProcessKiller.c\
+ switch.c \
+ format.c \
+ devmapper.c
LOCAL_MODULE:= vold
@@ -32,5 +30,3 @@
LOCAL_SHARED_LIBRARIES := libcutils
include $(BUILD_EXECUTABLE)
-
-endif