sr: Clean up f2fs tools (part of fstools now)

 * Also update for new pigz version

Change-Id: I93b2c9b659f911cb6fd0646e15dbb48781c254b8

2 files changed, 2 insertions, 11 deletions

diff --git a/Android.mk b/Android.mk
index 01bc488..4bc29de 100644
--- a/Android.mk
+++ b/Android.mk
@@ -75,7 +75,8 @@ LOCAL_STATIC_LIBRARIES := \
     libminiunz_static \
     libsparse_static \
     libfsck_msdos \
-    libminipigz \
+    libminipigz_static \
+    libzopfli \
     libreboot_static \
     libminzip \
     libz \
diff --git a/recovery_cmds.h b/recovery_cmds.h
index 51bf57c..935f283 100644
--- a/recovery_cmds.h
+++ b/recovery_cmds.h
@@ -31,11 +31,6 @@ int pigz_main(int argc, char **argv);
 int start_main(int argc, char **argv);
 int stop_main(int argc, char **argv);
 int mksh_main(int argc, char **argv);
-#ifdef USE_F2FS
-int make_f2fs_main(int argc, char **argv);
-int fsck_f2fs_main(int argc, char **argv);
-int fibmap_main(int argc, char **argv);
-#endif
 
 int toybox_driver(int argc, char **argv);
 
@@ -59,11 +54,6 @@ static const struct recovery_cmd recovery_cmds[] = {
     { "start",          start_main },
     { "stop",           stop_main },
     { "sh",             mksh_main },
-#ifdef USE_F2FS
-    { "mkfs.f2fs",      make_f2fs_main },
-    { "fsck.f2fs",      fsck_f2fs_main },
-    { "fibmap.f2fs",    fibmap_main },
-#endif
     { NULL, NULL },
 };