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

Modify apply_patch to fail if trying to patch mtd on non-mtd devices.

Browse Source 
Change-Id: I09c5bb5d12d838fdc4c4c6eb380021c9b3f3e33e
This commit is contained in:
Koushik Dutta 2010-11-11 00:00:45 -08:00
parent 1b86754eaa
commit d771acbed0
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Android.mk
View File

@ -78,6 +78,7 @@ ifdef BOARD_USES_BMLUTILS
else ifdef BOARD_USES_MMCUTILS
BOARD_FLASH_LIBRARY := libmmcutils
else
LOCAL_CFLAGS += -DBOARD_USES_MTDUTILS
BOARD_FLASH_LIBRARY := libmtdutils
endif

11
applypatch/applypatch.c
View File

@ -114,6 +114,7 @@ void FreeFileContents(FileContents* file) {
// hash of the data, and we'll do the load expecting to find one of
// those hashes.
int LoadMTDContents(const char* filename, FileContents* file) {
#ifdef BOARD_USES_MTDUTILS
char* copy = strdup(filename);
const char* magic = strtok(copy, ":");
if (strcmp(magic, "MTD") != 0) {
@ -256,6 +257,10 @@ int LoadMTDContents(const char* filename, FileContents* file) {
free(sha1sum);
return 0;
#else
printf("mtd utils not supported.\n");
return -1;
#endif
}
@ -296,6 +301,7 @@ int SaveFileContents(const char* filename, FileContents file) {
// "MTD:<partition>[:...]". Return 0 on success.
int WriteToMTDPartition(unsigned char* data, size_t len,
const char* target_mtd) {
#ifdef BOARD_USES_MTDUTILS
char* partition = strchr(target_mtd, ':');
if (partition == NULL) {
printf("bad MTD target name \"%s\"\n", target_mtd);
@ -348,6 +354,11 @@ int WriteToMTDPartition(unsigned char* data, size_t len,
free(partition);
return 0;
#else
printf("mtd utils not supported.\n");
return -1;
#endif
}