Merge "Added support for version 51 class files in dx"
diff --git a/dx/src/com/android/dx/command/dexer/Main.java b/dx/src/com/android/dx/command/dexer/Main.java
index 8f1a3e8..a9d5a32 100644
--- a/dx/src/com/android/dx/command/dexer/Main.java
+++ b/dx/src/com/android/dx/command/dexer/Main.java
@@ -126,9 +126,6 @@
"transaction", "xml"
};
- /** number of warnings during processing */
- private static int warnings = 0;
-
/** number of errors during processing */
private static int errors = 0;
@@ -183,8 +180,7 @@
* @return 0 if success > 0 otherwise.
*/
public static int run(Arguments arguments) throws IOException {
- // Reset the error/warning count to start fresh.
- warnings = 0;
+ // Reset the error count to start fresh.
errors = 0;
// empty the list, so that tools that load dx and keep it around
// for multiple runs don't reuse older buffers.
@@ -336,7 +332,7 @@
}
} catch (StopProcessing ex) {
/*
- * Ignore it and just let the warning/error reporting do
+ * Ignore it and just let the error reporting do
* their things.
*/
}
@@ -350,11 +346,6 @@
}
}
- if (warnings != 0) {
- DxConsole.err.println(warnings + " warning" +
- ((warnings == 1) ? "" : "s"));
- }
-
if (errors != 0) {
DxConsole.err.println(errors + " error" +
((errors == 1) ? "" : "s") + "; aborting");
@@ -498,8 +489,7 @@
ex.printContext(DxConsole.err);
}
}
-
- warnings++;
+ errors++;
return false;
}