Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_bootable_recovery into gingerbread

This commit is contained in:
Arif Ali 2011-07-20 22:52:04 +01:00
commit 81a1ffea20
2 changed files with 2 additions and 2 deletions

View File

@ -26,7 +26,7 @@ LOCAL_MODULE := recovery
LOCAL_FORCE_STATIC_EXECUTABLE := true
RECOVERY_VERSION := ClockworkMod Recovery v4.0.1.0
RECOVERY_VERSION := ClockworkMod Recovery v4.0.1.4
LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)"
RECOVERY_API_VERSION := 2
LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)

View File

@ -318,7 +318,7 @@ static void ensure_directory(const char* dir) {
typedef int (*nandroid_restore_handler)(const char* backup_file_image, const char* backup_path, int callback);
static int unyaffs_wrapper(const char* backup_file_image, const char* backup_path, int callback) {
return unyaffs(backup_file_image, backup_path, callback);
return unyaffs(backup_file_image, backup_path, callback ? yaffs_callback : NULL);
}
static int tar_extract_wrapper(const char* backup_file_image, const char* backup_path, int callback) {