merge busybox and other tools into recovery.
diff --git a/mtdutils/Android.mk b/mtdutils/Android.mk
index bbdc72f..790b8bd 100644
--- a/mtdutils/Android.mk
+++ b/mtdutils/Android.mk
@@ -30,28 +30,14 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := flash_image.c
-#LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
-LOCAL_MODULE := recovery_flash_image
-#LOCAL_MODULE_TAGS := eng
-#LOCAL_STATIC_LIBRARIES := libmtdutils libcutils libc
-#LOCAL_MODULE_STEM := flash_image
-#LOCAL_FORCE_STATIC_EXECUTABLE := true
-#LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
+LOCAL_MODULE := libflash_image
LOCAL_CFLAGS += -Dmain=flash_image_main
-#ADDITIONAL_RECOVERY_EXECUTABLES += recovery_flash_image
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := dump_image.c
-#LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
-LOCAL_MODULE := recovery_dump_image
-#LOCAL_MODULE_TAGS := eng
-#LOCAL_STATIC_LIBRARIES := libmtdutils libcutils libc
-#LOCAL_MODULE_STEM := dump_image
-#LOCAL_FORCE_STATIC_EXECUTABLE := true
-#LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
+LOCAL_MODULE := libdump_image
LOCAL_CFLAGS += -Dmain=dump_image_main
-#ADDITIONAL_RECOVERY_EXECUTABLES += recovery_dump_image
include $(BUILD_STATIC_LIBRARY)
@@ -60,12 +46,12 @@
LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
LOCAL_MODULE := recovery_tools
LOCAL_MODULE_TAGS := eng
-LOCAL_STATIC_LIBRARIES := recovery_mkyaffs2image recovery_unyaffs recovery_dump_image recovery_flash_image libmtdutils libcutils libc
+LOCAL_STATIC_LIBRARIES := libmkyaffs2image libunyaffs libdump_image libflash_image libmtdutils libcutils libc
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
LOCAL_UNSTRIPPED_PATH := $(TARGET_OUT_EXECUTABLES_UNSTRIPPED)
ADDITIONAL_RECOVERY_EXECUTABLES += recovery_tools
-include $(BUILD_EXECUTABLE)
+#include $(BUILD_EXECUTABLE)
endif # TARGET_ARCH == arm
endif # !TARGET_SIMULATOR