recovery: Assimilate minivold

Reduces recovery footprint by ~306kb.

Change-Id: Ibc2d791b6dbf7e125cd95f753d0b4e46fca1e827

Android.mk

@@ -74,6 +74,7 @@ LOCAL_C_INCLUDES += \
 
 LOCAL_STATIC_LIBRARIES := \
     libbatterymonitor \
+    libminivold_static \
     libext4_utils_static \
     libmake_ext4fs_static \
     libminizip_static \
@@ -93,13 +94,20 @@ LOCAL_STATIC_LIBRARIES := \
     libfusesideload \
     libminui \
     libpng \
+    libf2fs_sparseblock \
+    libdiskconfig \
+    libsysutils \
     libfs_mgr \
-    libcrypto_static \
+    libsquashfs_utils \
     libbase \
     libcutils \
     libutils \
     liblog \
+    liblogwrap \
     libselinux \
+    libcrypto_static \
+    libscrypt_static \
+    libnl \
     libc++_static \
     libm \
     libc \
@@ -156,8 +164,7 @@ LOCAL_C_INCLUDES += external/boringssl/include
 ifeq ($(ONE_SHOT_MAKEFILE),)
 LOCAL_ADDITIONAL_DEPENDENCIES += \
     fstools \
-    recovery_mkshrc \
-    minivold
+    recovery_mkshrc
 
 endif
 
@@ -169,7 +176,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += toybox_recovery_links
 
 # Set up the static symlinks
 RECOVERY_TOOLS := \
-    gunzip gzip make_ext4fs reboot setup_adbd sh start stop toybox unzip vdc zip
+    gunzip gzip make_ext4fs minivold reboot setup_adbd sh start stop toybox unzip vdc zip
 LOCAL_POST_INSTALL_CMD := \
 	$(hide) $(foreach t,$(RECOVERY_TOOLS),ln -sf recovery $(TARGET_RECOVERY_ROOT_OUT)/sbin/$(t);)
 

recovery_cmds.h

@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 
+int vold_main(int argc, char **argv);
 int minizip_main(int argc, char **argv);
 int miniunz_main(int argc, char **argv);
 int make_ext4fs_main(int argc, char **argv);
@@ -41,6 +42,7 @@ struct recovery_cmd {
 };
 
 static const struct recovery_cmd recovery_cmds[] = {
+    { "minivold",       vold_main },
     { "minizip",        minizip_main },
     { "make_ext4fs",    make_ext4fs_main },
     { "reboot",         reboot_main },