diff options
| author | Xavier Ducrohet <xav@android.com> | 2013-01-15 10:49:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-15 10:49:12 -0800 |
| commit | dd52dfed52404490d51ca5ed43c2192cbc25a7a7 (patch) | |
| tree | b9b7a58a7eeb8a09ef827c4adb2db9218d81024a /tools | |
| parent | 9af5cf2b38d82d5ddda5ada67aab51314b473800 (diff) | |
| parent | de3b69e0512c00158333a223f6c53c9eac7b3d34 (diff) | |
| download | frameworks_base-dd52dfed52404490d51ca5ed43c2192cbc25a7a7.zip frameworks_base-dd52dfed52404490d51ca5ed43c2192cbc25a7a7.tar.gz frameworks_base-dd52dfed52404490d51ca5ed43c2192cbc25a7a7.tar.bz2 | |
am de3b69e0: Merge "Fix the single crunch command to return the right error code." into jb-mr1-dev
* commit 'de3b69e0512c00158333a223f6c53c9eac7b3d34':
Fix the single crunch command to return the right error code.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/Command.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index b98925b..c3a0930 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -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] = { |