Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

allow the parted and fix permissions tools to be optional

  • Loading branch information...
commit 23ce6b14aec6ebc97fcd6972df46cd8c2bbdd66f 1 parent 56606a2
@koush koush authored
Showing with 11 additions and 1 deletion.
  1. +5 −1 Android.mk
  2. +2 −0  extendedcommands.c
  3. +4 −0 utilities/Android.mk
View
6 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)
@@ -125,6 +125,10 @@ ifdef BOARD_HAS_MTD_CACHE
LOCAL_CFLAGS += -DBOARD_HAS_MTD_CACHE
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.
View
2  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
};
View
4 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
Please sign in to comment.
Something went wrong with that request. Please try again.