From 9666ecc4c6e27467515e362dc25a785dec69fc1b Mon Sep 17 00:00:00 2001
From: cushon <cushon@google.com>
Date: Fri, 13 Apr 2018 16:58:05 -0700
Subject: 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
---
 .../java/com/google/devtools/build/buildjar/javac/JavacOptions.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/java_tools')

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;
-- 
cgit v1.2.3