From: Xavier Ducrohet <xav@android.com>
Date: Tue, 15 Jan 2013 02:02:40 +0000 (-0800)
Subject: Fix the single crunch command to return the right error code.
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/07a3e200a0aa8d6c1e3356bfdf97ff54dd0df488

Fix the single crunch command to return the right error code.

Casting from status_t to int doesn't work for return values
if the lower 8 bits are all 0.

Change-Id: I88e910dfe46cb72acd1595352e71da3c8eff4ca9
---

diff --git a/Command.cpp b/Command.cpp
index b98925b..c3a0930 100644
--- a/Command.cpp
+++ b/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] = {