diff options
| author | Xavier Ducrohet <xav@android.com> | 2013-01-15 16:47:29 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-15 16:47:29 -0800 |
| commit | 4feaa4f945c1dd46cc12c8451755c7d7d77f4c2b (patch) | |
| tree | c0bf08bbc575ff3793fe7b8d0f245550d15034f7 /tools | |
| parent | 0728441b932ab806f3616367554fb0618e49d93a (diff) | |
| parent | b7de2194d54eb81b1db4b50c171ddd0339831155 (diff) | |
| download | frameworks_base-4feaa4f945c1dd46cc12c8451755c7d7d77f4c2b.zip frameworks_base-4feaa4f945c1dd46cc12c8451755c7d7d77f4c2b.tar.gz frameworks_base-4feaa4f945c1dd46cc12c8451755c7d7d77f4c2b.tar.bz2 | |
am b7de2194: resolved conflicts for merge of c71c678e to master
* commit 'b7de2194d54eb81b1db4b50c171ddd0339831155':
Fix the single crunch command to return the right error code.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/Command.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index b98925b..5cec06f 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -1852,7 +1852,13 @@ 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] = { |