Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

use source built e2fsprogs! thanks cvpcs!

Change-Id: Id3067d4da53643ae1af0b9f15445262afda7b197
  • Loading branch information...
commit a465962667a4567e57e35f5193eb4fbd2b98e938 1 parent e2a6658
@koush koush authored
View
9 Android.mk
@@ -49,7 +49,7 @@ else
endif
LOCAL_CFLAGS += -DBOARD_RECOVERY_CHAR_WIDTH=$(BOARD_RECOVERY_CHAR_WIDTH) -DBOARD_RECOVERY_CHAR_HEIGHT=$(BOARD_RECOVERY_CHAR_HEIGHT)
-BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_HAS_SMALL_RECOVERY BOARD_UMS_LUNFILE BOARD_RECOVERY_ALWAYS_WIPES BOARD_RECOVERY_HANDLES_MOUNT
+BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_UMS_LUNFILE BOARD_RECOVERY_ALWAYS_WIPES BOARD_RECOVERY_HANDLES_MOUNT BOARD_TOUCH_RECOVERY
$(foreach board_define,$(BOARD_RECOVERY_DEFINES), \
$(if $($(board_define)), \
@@ -109,12 +109,7 @@ ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_SYMLINKS)
# Now let's do recovery symlinks
BUSYBOX_LINKS := $(shell cat external/busybox/busybox-minimal.links)
-ifndef BOARD_HAS_SMALL_RECOVERY
-exclude := tune2fs
-ifeq ($(BOARD_HAS_LARGE_FILESYSTEM),true)
-exclude += mke2fs
-endif
-endif
+exclude := tune2fs mke2fs
RECOVERY_BUSYBOX_SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(filter-out $(exclude),$(notdir $(BUSYBOX_LINKS))))
$(RECOVERY_BUSYBOX_SYMLINKS): BUSYBOX_BINARY := busybox
$(RECOVERY_BUSYBOX_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
View
2  extendedcommands.c
@@ -912,13 +912,11 @@ void show_advanced_menu()
"Report Error",
"Key Test",
"Show log",
-#ifndef BOARD_HAS_SMALL_RECOVERY
"Partition SD Card",
"Fix Permissions",
#ifdef BOARD_HAS_SDCARD_INTERNAL
"Partition Internal SD Card",
#endif
-#endif
NULL
};
View
4 mmcutils/Android.mk
@@ -4,10 +4,6 @@ ifeq ($(TARGET_ARCH),arm)
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-ifeq ($(BOARD_HAS_LARGE_FILESYSTEM),true)
-LOCAL_CFLAGS += -DBOARD_HAS_LARGE_FILESYSTEM
-endif
-
LOCAL_SRC_FILES := \
mmcutils.c
View
5 mmcutils/mmcutils.c
@@ -340,13 +340,8 @@ run_exec_process ( char **argv) {
int
format_ext3_device (const char *device) {
-#ifdef BOARD_HAS_LARGE_FILESYSTEM
char *const mke2fs[] = {MKE2FS_BIN, "-j", "-q", device, NULL};
char *const tune2fs[] = {TUNE2FS_BIN, "-C", "1", device, NULL};
-#else
- char *const mke2fs[] = {MKE2FS_BIN, "-j", device, NULL};
- char *const tune2fs[] = {TUNE2FS_BIN, "-j", "-C", "1", device, NULL};
-#endif
// Run mke2fs
if(run_exec_process(mke2fs)) {
printf("failure while running mke2fs\n");
View
58 utilities/Android.mk
@@ -1,8 +1,5 @@
LOCAL_PATH := $(call my-dir)
-ifndef BOARD_HAS_SMALL_RECOVERY
-
-
include $(CLEAR_VARS)
LOCAL_MODULE := fix_permissions
LOCAL_MODULE_TAGS := optional
@@ -27,38 +24,33 @@ LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
LOCAL_SRC_FILES := $(LOCAL_MODULE)
include $(BUILD_PREBUILT)
-endif
+# include $(CLEAR_VARS)
+# LOCAL_MODULE := e2fsck
+# 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)
-include $(CLEAR_VARS)
-LOCAL_MODULE := e2fsck
-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)
-
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := tune2fs
-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)
+# include $(CLEAR_VARS)
+# LOCAL_MODULE := tune2fs
+# 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)
-ifeq ($(BOARD_HAS_LARGE_FILESYSTEM),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := mke2fs
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
-LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
-ifeq ($(BOARD_MKE2FS),)
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-else
-LOCAL_SRC_FILES := ../../../$(BOARD_MKE2FS)
-endif
-include $(BUILD_PREBUILT)
-endif
+# include $(CLEAR_VARS)
+# LOCAL_MODULE := mke2fs
+# LOCAL_MODULE_TAGS := optional
+# LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
+# LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
+# ifeq ($(BOARD_MKE2FS),)
+# LOCAL_SRC_FILES := $(LOCAL_MODULE)
+# else
+# LOCAL_SRC_FILES := ../../../$(BOARD_MKE2FS)
+# endif
+# include $(BUILD_PREBUILT)
BOARD_RECOVERY_RFS_CHECK := $(shell grep rfs $(TARGET_DEVICE_DIR)/recovery.fstab)
ifneq ($(BOARD_RECOVERY_RFS_CHECK),)
Please sign in to comment.
Something went wrong with that request. Please try again.