Skip to content

Commit e17a78d

Browse files
committedSep 17, 2010
allow the parted and fix permissions tools to be optional
1 parent 4e10b13 commit e17a78d

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed
 

‎Android.mk

+5-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ LOCAL_MODULE := recovery
4444

4545
LOCAL_FORCE_STATIC_EXECUTABLE := true
4646

47-
RECOVERY_VERSION := ClockworkMod Recovery v2.5.0.8
47+
RECOVERY_VERSION := ClockworkMod Recovery v2.5.0.9
4848
LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)"
4949
RECOVERY_API_VERSION := 2
5050
LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
@@ -130,6 +130,10 @@ ifdef BOARD_USES_BMLUTILS
130130
LOCAL_STATIC_LIBRARIES += libbmlutils
131131
endif
132132

133+
ifdef BOARD_HAS_SMALL_RECOVERY
134+
LOCAL_CFLAGS += -DBOARD_HAS_SMALL_RECOVERY
135+
endif
136+
133137
# This binary is in the recovery ramdisk, which is otherwise a copy of root.
134138
# It gets copied there in config/Makefile. LOCAL_MODULE_TAGS suppresses
135139
# a (redundant) copy of the binary in /system/bin for user builds.

‎extendedcommands.c

+2
Original file line numberDiff line numberDiff line change
@@ -800,8 +800,10 @@ void show_advanced_menu()
800800
"Wipe Battery Stats",
801801
"Report Error",
802802
"Key Test",
803+
#ifndef BOARD_HAS_SMALL_RECOVERY
803804
"Partition SD Card",
804805
"Fix Permissions",
806+
#endif
805807
NULL
806808
};
807809

‎utilities/Android.mk

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
LOCAL_PATH := $(call my-dir)
22

3+
ifndef BOARD_HAS_SMALL_RECOVERY
4+
35
include $(CLEAR_VARS)
46
LOCAL_MODULE := e2fsck
57
LOCAL_MODULE_TAGS := eng
@@ -39,3 +41,5 @@ LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
3941
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
4042
LOCAL_SRC_FILES := $(LOCAL_MODULE)
4143
include $(BUILD_PREBUILT)
44+
45+
endif

0 commit comments

Comments
 (0)
Please sign in to comment.