Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am de3b69e0: Merge "Fix the single crunch command to return the right error code." into jb-mr1-dev

Browse Source 
* commit 'de3b69e0512c00158333a223f6c53c9eac7b3d34':
  Fix the single crunch command to return the right error code.
This commit is contained in:
Xavier Ducrohet
2013-01-15 10:49:12 -08:00
committed by Android Git Automerger
parent 9af5cf2b38 de3b69e051
commit dd52dfed52
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/aapt/Command.cpp
View File

@@ -1852,7 +1852,11 @@ int doSingleCrunch(Bundle* bundle)
String8 input(bundle->getSingleCrunchInputFile());
String8 output(bundle->getSingleCrunchOutputFile());
return preProcessImageToCache(bundle, input, output);
if (preProcessImageToCache(bundle, input, output) != NO_ERROR) {
// we can't return the status_t as it gets truncate to the lower 8 bits.
return 42;
}
return NO_ERROR;
}
char CONSOLE_DATA[2925] = {