]> git.saurik.com Git - android/aapt.git/commitdiff
Fix the single crunch command to return the right error code.
authorXavier Ducrohet <xav@android.com>
Tue, 15 Jan 2013 02:02:40 +0000 (18:02 -0800)
committerXavier Ducrohet <xav@android.com>
Tue, 15 Jan 2013 18:37:20 +0000 (10:37 -0800)
Casting from status_t to int doesn't work for return values
if the lower 8 bits are all 0.

Change-Id: I88e910dfe46cb72acd1595352e71da3c8eff4ca9

Command.cpp

index b98925bd184cc0415735af4be1c27385a4dc0869..c3a093034d7d3b39e02f30488f195c73656d2a86 100644 (file)
@@ -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] = {