diff options
author | Benoit Lamarche <benoitlamarche@google.com> | 2015-04-07 17:26:52 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-07 17:26:53 +0000 |
commit | f052d52e8b28d1b0053cdd6a80b9ce9de5c729d8 (patch) | |
tree | d352262129262e5a2ede80a74d8cdb1dc4bd90a7 | |
parent | 90fcf3599d8450e64e6788504972419cc7184d5a (diff) | |
parent | e345a3565597b76ee5bf6bfbf2c84ce9271be079 (diff) | |
download | android_dalvik-f052d52e8b28d1b0053cdd6a80b9ce9de5c729d8.tar.gz android_dalvik-f052d52e8b28d1b0053cdd6a80b9ce9de5c729d8.tar.bz2 android_dalvik-f052d52e8b28d1b0053cdd6a80b9ce9de5c729d8.zip |
Merge "Command line option for disabling warnings" into lmp-mr1-dev
-rw-r--r-- | dx/src/com/android/dx/command/DxConsole.java | 13 | ||||
-rw-r--r-- | dx/src/com/android/dx/command/Main.java | 2 | ||||
-rw-r--r-- | dx/src/com/android/dx/command/dexer/Main.java | 12 |
3 files changed, 25 insertions, 2 deletions
diff --git a/dx/src/com/android/dx/command/DxConsole.java b/dx/src/com/android/dx/command/DxConsole.java index 9ce9836ef..919de8c80 100644 --- a/dx/src/com/android/dx/command/DxConsole.java +++ b/dx/src/com/android/dx/command/DxConsole.java @@ -16,6 +16,8 @@ package com.android.dx.command; +import java.io.IOException; +import java.io.OutputStream; import java.io.PrintStream; /** @@ -34,4 +36,15 @@ public class DxConsole { * Error output stream. Links to {@code System.err} by default. */ public static PrintStream err = System.err; + + /** + * Output stream which prints to nowhere. + */ + public static final PrintStream noop = new PrintStream(new OutputStream() { + + @Override + public void write(int b) throws IOException { + // noop + } + }); } diff --git a/dx/src/com/android/dx/command/Main.java b/dx/src/com/android/dx/command/Main.java index 9834987e5..a0be5bd51 100644 --- a/dx/src/com/android/dx/command/Main.java +++ b/dx/src/com/android/dx/command/Main.java @@ -33,7 +33,7 @@ public class Main { "[--dump-width=<n>]\n" + " [--dump-method=<name>[*]] [--verbose-dump] [--no-files] " + "[--core-library]\n" + - " [--num-threads=<n>] [--incremental] [--force-jumbo]\n" + + " [--num-threads=<n>] [--incremental] [--force-jumbo] [--no-warning]\n" + " [--multi-dex [--main-dex-list=<file> [--minimal-main-dex]]\n" + " [--input-list=<file>]\n" + " [<file>.class | <file>.{zip,jar,apk} | <directory>] ...\n" + diff --git a/dx/src/com/android/dx/command/dexer/Main.java b/dx/src/com/android/dx/command/dexer/Main.java index 4a3d1952f..563a93c39 100644 --- a/dx/src/com/android/dx/command/dexer/Main.java +++ b/dx/src/com/android/dx/command/dexer/Main.java @@ -1199,6 +1199,9 @@ public class Main { /** whether to run in debug mode */ public boolean debug = false; + /** whether to emit warning messages */ + public boolean warnings = true; + /** whether to emit high-level verbose human-oriented output */ public boolean verbose = false; @@ -1409,6 +1412,8 @@ public class Main { while(parser.getNext()) { if (parser.isArg("--debug")) { debug = true; + } else if (parser.isArg("--no-warning")) { + warnings = false; } else if (parser.isArg("--verbose")) { verbose = true; } else if (parser.isArg("--verbose-dump")) { @@ -1580,7 +1585,12 @@ public class Main { cfOptions.optimizeListFile = optimizeListFile; cfOptions.dontOptimizeListFile = dontOptimizeListFile; cfOptions.statistics = statistics; - cfOptions.warn = DxConsole.err; + + if (warnings) { + cfOptions.warn = DxConsole.err; + } else { + cfOptions.warn = DxConsole.noop; + } dexOptions = new DexOptions(); dexOptions.forceJumbo = forceJumbo; |