From e17a78ddda57d4f7bbdc5b07e59bb15927bf0d30 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sun, 29 Aug 2010 12:35:10 -0700
Subject: [PATCH] allow the parted and fix permissions tools to be optional

---
 Android.mk           | 6 +++++-
 extendedcommands.c   | 2 ++
 utilities/Android.mk | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 13b78f5..604faa1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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)
@@ -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.
diff --git a/extendedcommands.c b/extendedcommands.c
index 31944e7..d70e0fd 100644
--- a/extendedcommands.c
+++ b/extendedcommands.c
@@ -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
     };
 
diff --git a/utilities/Android.mk b/utilities/Android.mk
index dc79704..f6b6e64 100644
--- a/utilities/Android.mk
+++ b/utilities/Android.mk
@@ -1,5 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
+ifndef BOARD_HAS_SMALL_RECOVERY
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := e2fsck
 LOCAL_MODULE_TAGS := eng
@@ -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