Skip to content

Commit

Permalink
allow the parted and fix permissions tools to be optional
Browse files Browse the repository at this point in the history
  • Loading branch information
koush committed Sep 17, 2010
1 parent 4e10b13 commit e17a78d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ LOCAL_MODULE := recovery

LOCAL_FORCE_STATIC_EXECUTABLE := true

RECOVERY_VERSION := ClockworkMod Recovery v2.5.0.8
RECOVERY_VERSION := ClockworkMod Recovery v2.5.0.9
LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)"
RECOVERY_API_VERSION := 2
LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
Expand Down Expand Up @@ -130,6 +130,10 @@ ifdef BOARD_USES_BMLUTILS
LOCAL_STATIC_LIBRARIES += libbmlutils
endif

ifdef BOARD_HAS_SMALL_RECOVERY
LOCAL_CFLAGS += -DBOARD_HAS_SMALL_RECOVERY
endif

# This binary is in the recovery ramdisk, which is otherwise a copy of root.
# It gets copied there in config/Makefile. LOCAL_MODULE_TAGS suppresses
# a (redundant) copy of the binary in /system/bin for user builds.
Expand Down
2 changes: 2 additions & 0 deletions extendedcommands.c
Original file line number Diff line number Diff line change
Expand Up @@ -800,8 +800,10 @@ void show_advanced_menu()
"Wipe Battery Stats",
"Report Error",
"Key Test",
#ifndef BOARD_HAS_SMALL_RECOVERY
"Partition SD Card",
"Fix Permissions",
#endif
NULL
};

Expand Down
4 changes: 4 additions & 0 deletions utilities/Android.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
LOCAL_PATH := $(call my-dir)

ifndef BOARD_HAS_SMALL_RECOVERY

include $(CLEAR_VARS)
LOCAL_MODULE := e2fsck
LOCAL_MODULE_TAGS := eng
Expand Down Expand Up @@ -39,3 +41,5 @@ LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
LOCAL_SRC_FILES := $(LOCAL_MODULE)
include $(BUILD_PREBUILT)

endif

0 comments on commit e17a78d

Please sign in to comment.