From d4ca7f0fca235c273cc6968c762e2e1e536eefe0 Mon Sep 17 00:00:00 2001
From: Tom Marshall <tdm@cyngn.com>
Date: Wed, 2 Dec 2015 15:09:20 -0800
Subject: recovery: Assimilate minivold

Reduces recovery footprint by ~306kb.

Change-Id: Ibc2d791b6dbf7e125cd95f753d0b4e46fca1e827
---
 Android.mk      | 15 ++++++++++++---
 recovery_cmds.h |  2 ++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 06b58e8..4584557 100644
--- a/Android.mk
+++ b/Android.mk
@@ -73,6 +73,7 @@ LOCAL_C_INCLUDES += \
     external/e2fsprogs/lib
 
 LOCAL_STATIC_LIBRARIES := \
+    libminivold_static \
     libext4_utils_static \
     libmake_ext4fs_static \
     libminizip_static \
@@ -93,11 +94,20 @@ LOCAL_STATIC_LIBRARIES := \
     libfusesideload \
     libminui \
     libpng \
+    libf2fs_sparseblock \
+    libdiskconfig \
+    libsysutils \
     libfs_mgr \
+    libsquashfs_utils \
     libbase \
     libcutils \
+    libutils \
     liblog \
+    liblogwrap \
     libselinux \
+    libcrypto_static \
+    libscrypt_static \
+    libnl \
     libc++_static \
     libm \
     libc \
@@ -148,8 +158,7 @@ LOCAL_C_INCLUDES += external/boringssl/include
 ifeq ($(ONE_SHOT_MAKEFILE),)
 LOCAL_ADDITIONAL_DEPENDENCIES += \
     fstools \
-    recovery_mkshrc \
-    minivold
+    recovery_mkshrc
 
 endif
 
@@ -161,7 +170,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);)
 
diff --git a/recovery_cmds.h b/recovery_cmds.h
index 09a92d9..8fc4d3e 100644
--- a/recovery_cmds.h
+++ b/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 },
-- 
cgit v1.1