drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev

Browse Source 
* commit '6080cc5fd7c332c79098a50605c0c37d99d4c481':
  Fix the single crunch command to return the right error code.
This commit is contained in:
Xavier Ducrohet
2013-01-15 14:48:02 -08:00
committed by Android Git Automerger
parent b78714b5df 6080cc5fd7
commit a4e10cc746
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/aapt/Command.cpp
View File

@ -1839,6 +1839,25 @@ int doCrunch(Bundle* bundle)
return NO_ERROR; return NO_ERROR;
} }
/*
* Do PNG Crunching on a single flag
* -i points to a single png file
* -o points to a single png output file
*/
int doSingleCrunch(Bundle* bundle)
{
fprintf(stdout, "Crunching single PNG file: %s\n", bundle->getSingleCrunchInputFile());
fprintf(stdout, "\tOutput file: %s\n", bundle->getSingleCrunchOutputFile());
String8 input(bundle->getSingleCrunchInputFile());
String8 output(bundle->getSingleCrunchOutputFile());
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] = { char CONSOLE_DATA[2925] = {
32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
32, 32, 32, 32, 32, 32, 32, 95, 46, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 95, 46, 32, 32, 32, 32, 32, 32, 32, 32, 32,