From f0ef6eccb5348871125cd97e67d8e81e8c35260e Mon Sep 17 00:00:00 2001 From: "Koushik K. Dutta" Date: Wed, 3 Mar 2010 00:43:07 -0800 Subject: [PATCH] merge busybox and other tools into recovery. --- Android.mk | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/Android.mk b/Android.mk index 9e90491..c6b5e8e 100644 --- a/Android.mk +++ b/Android.mk @@ -23,63 +23,44 @@ $(call dist-for-goals,droid,$(LOCAL_BUILT_MODULE)) include $(CLEAR_VARS) - LOCAL_SRC_FILES := \ yaffs2/utils/mkyaffs2image.c \ yaffs2/yaffs_packedtags2.c \ yaffs2/yaffs_ecc.c \ yaffs2/yaffs_tagsvalidity.c - LOCAL_CFLAGS = -O2 -Wall -DCONFIG_YAFFS_UTIL -DCONFIG_YAFFS_DOES_ECC LOCAL_CFLAGS+= -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations LOCAL_CFLAGS+= -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline LOCAL_CFLAGS+= -DS_IWRITE=0200 -DS_IREAD=0400 LOCAL_C_INCLUDES += $(LOCAL_PATH)/yaffs2 LOCAL_MODULE := mkyaffs2image - include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) - LOCAL_SRC_FILES := \ yaffs2/utils/mkyaffs2image.c \ yaffs2/yaffs_packedtags2.c \ yaffs2/yaffs_ecc.c \ yaffs2/yaffs_tagsvalidity.c - LOCAL_CFLAGS = -O2 -Wall -DCONFIG_YAFFS_UTIL -DCONFIG_YAFFS_DOES_ECC LOCAL_CFLAGS+= -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations LOCAL_CFLAGS+= -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline LOCAL_CFLAGS+= -DS_IWRITE=0200 -DS_IREAD=0400 -#LOCAL_FORCE_STATIC_EXECUTABLE := true -#LOCAL_STATIC_LIBRARIES := libc libcutils -#LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_C_INCLUDES += $(LOCAL_PATH)/yaffs2 -#LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin -#LOCAL_MODULE_STEM := mkyaffs2image -LOCAL_MODULE := recovery_mkyaffs2image -#ADDITIONAL_RECOVERY_EXECUTABLES += recovery_mkyaffs2image +LOCAL_MODULE := libmkyaffs2image LOCAL_CFLAGS += -Dmain=mkyaffs2image_main include $(BUILD_STATIC_LIBRARY) - include $(CLEAR_VARS) -LOCAL_MODULE := recovery_unyaffs -#LOCAL_MODULE_STEM := unyaffs -#LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES -#LOCAL_MODULE_TAGS := eng -#LOCAL_FORCE_STATIC_EXECUTABLE := true +LOCAL_MODULE := libunyaffs LOCAL_SRC_FILES := yaffs2/utils/unyaffs.c -#LOCAL_STATIC_LIBRARIES := libc libcutils -#LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin LOCAL_CFLAGS = -O2 -Wall -DCONFIG_YAFFS_UTIL -DCONFIG_YAFFS_DOES_ECC LOCAL_CFLAGS+= -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations LOCAL_CFLAGS+= -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline LOCAL_CFLAGS+= -DS_IWRITE=0200 -DS_IREAD=0400 LOCAL_C_INCLUDES += $(LOCAL_PATH)/yaffs2 LOCAL_CFLAGS += -Dmain=unyaffs_main -#ADDITIONAL_RECOVERY_EXECUTABLES += recovery_unyaffs include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -92,3 +73,16 @@ LOCAL_CFLAGS+= -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winlin LOCAL_CFLAGS+= -DS_IWRITE=0200 -DS_IREAD=0400 LOCAL_C_INCLUDES += $(LOCAL_PATH)/yaffs2 include $(BUILD_EXECUTABLE) + +include $(CLEAR_VARS) +LOCAL_MODULE := unyaffs +LOCAL_SRC_FILES := yaffs2/utils/unyaffs.c +LOCAL_MODULE_TAGS := eng +LOCAL_CFLAGS = -O2 -Wall -DCONFIG_YAFFS_UTIL -DCONFIG_YAFFS_DOES_ECC +LOCAL_CFLAGS+= -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations +LOCAL_CFLAGS+= -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline +LOCAL_CFLAGS+= -DS_IWRITE=0200 -DS_IREAD=0400 +LOCAL_C_INCLUDES += $(LOCAL_PATH)/yaffs2 +include $(BUILD_HOST_EXECUTABLE) + +