commit a64c6973337d64fffc7796c7ef9456b572ba459e
author Koushik Dutta <koushd@gmail.com> Sun Nov 27 14:07:29 2011 -0800
committer Koushik Dutta <koushd@gmail.com> Sun Nov 27 14:07:29 2011 -0800
tree ca405ea9c08b2078a78ad92517fd8db11ab09c1d
parent a9017dabc53e6949e7bed351e6bd99bdb122777a

Fix up the autoinclusion rules for the recoveryimage target.

utilities/Android.mk

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 @@
 
 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 $(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 $(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 $(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 @@
 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 @@
 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