android/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'eclair' of git://github.com/koush/android_bootable_recovery into eclair

Browse Source
This commit is contained in:
Koushik Dutta 2010-05-24 22:34:46 -07:00
commit 77c452689d
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mtdutils/Android.mk
View File

@ -77,6 +77,16 @@ LOCAL_STATIC_LIBRARIES := libmtdutils libcutils libc
LOCAL_FORCE_STATIC_EXECUTABLE := true
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := erase_image.c
LOCAL_MODULE := utility_erase_image
LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES
LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities
LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities
LOCAL_MODULE_STEM := erase_image
LOCAL_STATIC_LIBRARIES := libmtdutils libcutils libc
LOCAL_FORCE_STATIC_EXECUTABLE := true
include $(BUILD_EXECUTABLE)
endif # TARGET_ARCH == arm
endif # !TARGET_SIMULATOR

4
mtdutils/flash_image.c
View File

@ -121,6 +121,10 @@ int main(int argc, char **argv) {
size_t block_size;
if (mtd_partition_info(partition, NULL, &block_size, NULL))
die("error getting %s block size", argv[1]);
// Zinx says this fixes noncongiuous memory allocation issues?
if (block_size > 2048)
block_size = 2048;
if (lseek(fd, headerlen, SEEK_SET) != headerlen)
die("error rewinding %s", argv[2]);

4
ui.c
View File

@ -527,11 +527,11 @@ int ui_menu_select(int sel) {
if (menu_sel < menu_show_start && menu_show_start > 0) {
menu_show_start--;
menu_show_start = menu_sel;
}
if (menu_sel - menu_show_start + menu_top >= text_rows) {
menu_show_start++;
menu_show_start = menu_sel + menu_top - text_rows + 1;
}
sel = menu_sel;