diff options
| author |  cushon <cushon@google.com> | 2018-04-13 16:58:05 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-13 16:59:45 -0700 |
| commit | 9666ecc4c6e27467515e362dc25a785dec69fc1b (patch) | |
| tree | d2d9359b5538d44821647b283b05e13ae8f931f3 /src/java_tools | |
| parent | f477e860e3d5b5cb12ae572edbeb0e683aa112d3 (diff) | |
When normalizing -source and --release options, allow the last one to win
previously --release always took precedence.
if/when Bazel defaults to using e.g. --release 9, legacy -source and -target
javacopts should be respected.
PiperOrigin-RevId: 192844963
Diffstat (limited to 'src/java_tools')
| -rw-r--r-- | src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/JavacOptions.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/JavacOptions.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/JavacOptions.java index 9cff8b9c02..9e6494c10d 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/JavacOptions.java +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/JavacOptions.java @@ -243,22 +243,28 @@ public final class JavacOptions { case "-source": if (remaining.hasNext()) { source = remaining.next(); + release = null; } return true; case "-target": if (remaining.hasNext()) { target = remaining.next(); + release = null; } return true; case "--release": if (remaining.hasNext()) { release = remaining.next(); + source = null; + target = null; } return true; default: // fall out } if (option.startsWith("--release=")) { release = option.substring("--release=".length()); + source = null; + target = null; return true; } return false; |