aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/JavacOptions.java6
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;