From a64c6973337d64fffc7796c7ef9456b572ba459e Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sun, 27 Nov 2011 14:07:29 -0800 Subject: [PATCH] Fix up the autoinclusion rules for the recoveryimage target. --- Android.mk | 8 ++++---- flashutils/Android.mk | 23 ++++++++++++----------- utilities/Android.mk | 19 +++++++------------ 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/Android.mk b/Android.mk index 202d190..2856aa1 100644 --- a/Android.mk +++ b/Android.mk @@ -114,9 +114,11 @@ $(RECOVERY_BUSYBOX_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @rm -rf $@ $(hide) ln -sf $(BUSYBOX_BINARY) $@ +ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_BUSYBOX_SYMLINKS) + include $(CLEAR_VARS) LOCAL_MODULE := nandroid-md5.sh -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin LOCAL_SRC_FILES := nandroid-md5.sh @@ -124,14 +126,12 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := killrecovery.sh -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin LOCAL_SRC_FILES := killrecovery.sh include $(BUILD_PREBUILT) -ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_BUSYBOX_SYMLINKS) $(TARGET_RECOVERY_ROOT_OUT)/sbin/nandroid-md5.sh $(TARGET_RECOVERY_ROOT_OUT)/sbin/killrecovery.sh - include $(CLEAR_VARS) LOCAL_SRC_FILES := verifier_test.c verifier.c diff --git a/flashutils/Android.mk b/flashutils/Android.mk index aa4c7d3..615265a 100644 --- a/flashutils/Android.mk +++ b/flashutils/Android.mk @@ -6,7 +6,7 @@ ifeq ($(TARGET_ARCH),arm) include $(CLEAR_VARS) LOCAL_SRC_FILES := flashutils.c LOCAL_MODULE := libflashutils -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES += bootable/recovery LOCAL_STATIC_LIBRARIES := libmmcutils libmtdutils libbmlutils libcrecovery @@ -23,8 +23,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := flash_image.c LOCAL_MODULE := flash_image -LOCAL_MODULE_TAGS := eng -#LOCAL_STATIC_LIBRARIES += $(BOARD_FLASH_LIBRARY) +LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils LOCAL_SHARED_LIBRARIES := libcutils libc include $(BUILD_EXECUTABLE) @@ -32,7 +31,7 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES := dump_image.c LOCAL_MODULE := dump_image -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils LOCAL_SHARED_LIBRARIES := libcutils libc include $(BUILD_EXECUTABLE) @@ -40,36 +39,38 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES := erase_image.c LOCAL_MODULE := erase_image -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils LOCAL_SHARED_LIBRARIES := libcutils libc include $(BUILD_EXECUTABLE) +ALL_DEFAULT_INSTALLED_MODULES += $(addprefix $(TARGET_OUT)/bin/, flash_image dump_image erase_image) + include $(CLEAR_VARS) LOCAL_SRC_FILES := flash_image.c LOCAL_MODULE := libflash_image -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -Dmain=flash_image_main include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := dump_image.c LOCAL_MODULE := libdump_image -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -Dmain=dump_image_main include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := erase_image.c LOCAL_MODULE := liberase_image -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -Dmain=erase_image_main include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := dump_image.c LOCAL_MODULE := utility_dump_image -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities @@ -81,7 +82,7 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES := flash_image.c LOCAL_MODULE := utility_flash_image -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities @@ -93,7 +94,7 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES := erase_image.c LOCAL_MODULE := utility_erase_image -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities diff --git a/utilities/Android.mk b/utilities/Android.mk index c5189f3..dc7630f 100755 --- a/utilities/Android.mk +++ b/utilities/Android.mk @@ -5,7 +5,7 @@ ifndef BOARD_HAS_SMALL_RECOVERY include $(CLEAR_VARS) LOCAL_MODULE := fix_permissions -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin LOCAL_SRC_FILES := $(LOCAL_MODULE) @@ -13,7 +13,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := parted -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin LOCAL_SRC_FILES := $(LOCAL_MODULE) @@ -21,19 +21,17 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := sdparted -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) -ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_BUSYBOX_SYMLINKS) $(TARGET_RECOVERY_ROOT_OUT)/sbin/fix_permissions $(TARGET_RECOVERY_ROOT_OUT)/sbin/parted $(TARGET_RECOVERY_ROOT_OUT)/sbin/sdparted - endif include $(CLEAR_VARS) LOCAL_MODULE := e2fsck -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin LOCAL_SRC_FILES := $(LOCAL_MODULE) @@ -42,7 +40,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := tune2fs -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin LOCAL_SRC_FILES := $(LOCAL_MODULE) @@ -51,7 +49,7 @@ include $(BUILD_PREBUILT) ifeq ($(BOARD_HAS_LARGE_FILESYSTEM),true) include $(CLEAR_VARS) LOCAL_MODULE := mke2fs -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin ifeq ($(BOARD_MKE2FS),) @@ -62,17 +60,14 @@ endif include $(BUILD_PREBUILT) endif -ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_BUSYBOX_SYMLINKS) $(TARGET_RECOVERY_ROOT_OUT)/sbin/e2fsck $(TARGET_RECOVERY_ROOT_OUT)/sbin/tune2fs $(TARGET_RECOVERY_ROOT_OUT)/sbin/mke2fs - BOARD_RECOVERY_RFS_CHECK := $(shell grep rfs $(TARGET_DEVICE_DIR)/recovery.fstab) ifneq ($(BOARD_RECOVERY_RFS_CHECK),) include $(CLEAR_VARS) LOCAL_MODULE := fat.format -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) -ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_BUSYBOX_SYMLINKS) $(TARGET_RECOVERY_ROOT_OUT)/sbin/fat.format endif \ No newline at end of file