resolved conflicts for merge of c71c678e to master

Change-Id: I9e1a6a1151af00f0a13e2010776276b240e0ac3a
2013-01-15 16:41:29 -08:00
parent e45113a156 c71c678e9b
commit b7de2194d5
1 changed files with 7 additions and 1 deletions
--- 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] = {