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

1 files changed, 5 insertions, 1 deletions

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index b98925bd184c..c3a093034d7d 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] = {