2 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
index 304d3f2d44..9ef4ffe01d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
@@ -740,6 +740,8 @@ public final class JavaCompileAction extends SpawnAction {
       }
       if (!javacOpts.isEmpty()) {
         result.addAll("--javacopts", ImmutableList.copyOf(javacOpts));
+        // terminate --javacopts with `--` to support javac flags that start with `--`
+        result.add("--");
       }
       if (ruleKind != null) {
         result.add("--rule_kind", ruleKind);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java
index 90975adf9b..2f50d9fd82 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java
@@ -545,6 +545,8 @@ public class JavaHeaderCompileAction extends SpawnAction {
       }
 
       result.addAll("--javacopts", javacOpts);
+      // terminate --javacopts with `--` to support javac flags that start with `--`
+      result.add("--");
 
       if (ruleKind != null) {
         result.add("--rule_kind", ruleKind);