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

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

Browse Source
This commit is contained in:
Arif Ali 2011-07-14 01:30:07 +01:00
commit cd264e7f94
5 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

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

8
bmlutils/bmlutils.c
View File

@ -80,6 +80,10 @@ int cmd_bml_restore_raw_partition(const char *partition, const char *filename)
if (strcmp(partition, "recovery") == 0 || strcmp(partition, "recoveryonly") == 0)
ret = restore_internal(BOARD_BML_RECOVERY, filename);
// support explicitly provided device paths
if (partition[0] == '/')
ret = restore_internal(partition, filename);
return ret;
}
@ -90,6 +94,10 @@ int cmd_bml_backup_raw_partition(const char *partition, const char *out_file)
bml = BOARD_BML_BOOT;
else if (strcmp("recovery", partition) == 0)
bml = BOARD_BML_RECOVERY;
else if (partition[0] == '/') {
// support explicitly provided device paths
bml = partition;
}
else {
printf("Invalid partition.\n");
return -1;

4
edifyscripting.c
View File

@ -145,10 +145,6 @@ Value* FormatFn(const char* name, State* state, int argc, Expr* argv[]) {
free(path);
return StringValue(strdup(""));
}
if (0 != format_volume("/sdcard/Android")) {
free(path);
return StringValue(strdup(""));
}
}
done:

13
nandroid.c
View File

@ -277,16 +277,6 @@ int nandroid_backup(const char* backup_path)
return ret;
}
if (0 != stat("/sdcard/Android", &s))
{
ui_print("No /sdcard/Android found. Skipping backup of application files on external storage.\n");
}
else
{
if (0 != (ret = nandroid_backup_partition_extended(backup_path, "/sdcard/Android", 0)))
return ret;
}
if (0 != (ret = nandroid_backup_partition_extended(backup_path, "/cache", 0)))
return ret;
@ -524,9 +514,6 @@ int nandroid_restore(const char* backup_path, int restore_boot, int restore_syst
if (restore_data && 0 != (ret = nandroid_restore_partition_extended(backup_path, "/sdcard/.android_secure", 0)))
return ret;
if (restore_data && 0 != (ret = nandroid_restore_partition_extended(backup_path, "/sdcard/Android", 0)))
return ret;
if (restore_cache && 0 != (ret = nandroid_restore_partition_extended(backup_path, "/cache", 0)))
return ret;

3
recovery.c
View File

@ -677,7 +677,6 @@ wipe_data(int confirm) {
}
erase_volume("/sd-ext");
erase_volume("/sdcard/.android_secure");
erase_volume("/sdcard/Android");
ui_print("Data wipe complete.\n");
}
@ -818,7 +817,7 @@ main(int argc, char **argv) {
case 'p': previous_runs = atoi(optarg); break;
case 's': send_intent = optarg; break;
case 'u': update_package = optarg; break;
case 'w':
case 'w':
#ifndef BOARD_RECOVERY_ALWAYS_WIPES
wipe_data = wipe_cache = 1;
#endif