Report problems as errors in dx (with exit codes)

(cherry picked from commit 593a7233e13d6eeb8ae5d894e29c6a27cbc7b7f0)

Change-Id: I6421f95ceb97a596a19781e46cb4767bfb21cdbd

1 files changed, 3 insertions, 13 deletions

diff --git a/dx/src/com/android/dx/command/dexer/Main.java b/dx/src/com/android/dx/command/dexer/Main.java
index 8f1a3e887..a9d5a32ec 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 @@ public class Main {
         "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 @@ public class Main {
      * @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 @@ public class Main {
             }
         } 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 @@ public class Main {
             }
         }
 
-        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 @@ public class Main {
                 ex.printContext(DxConsole.err);
             }
         }
-
-        warnings++;
+        errors++;
         return false;
     }