diff options
author | 2013-01-15 14:48:02 -0800 | |
---|---|---|
committer | 2013-01-15 14:48:02 -0800 | |
commit | a4e10cc746caea514216f436e2065b3bbefb25ef (patch) | |
tree | 3dce7e8ed99c06ac9483a48d660024b19b19a04d | |
parent | b78714b5dfc871fee251db125ec5e14f4e0aff5f (diff) | |
parent | 6080cc5fd7c332c79098a50605c0c37d99d4c481 (diff) |
am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev
* commit '6080cc5fd7c332c79098a50605c0c37d99d4c481':
Fix the single crunch command to return the right error code.
-rw-r--r-- | tools/aapt/Command.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index 0a5e5904a95a..08d655469a3a 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -1839,6 +1839,25 @@ int doCrunch(Bundle* bundle) 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] = { 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, |