Use separate "proto" javacopts for all proto compilations.

--
MOS_MIGRATED_REVID=138143803

2 files changed, 4 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
index 38b689415c..a1de020481 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
@@ -97,6 +97,8 @@ public interface JavaSemantics {
   public static final String JAVA7_JAVACOPTS_KEY = "java7";
   /** The java_toolchain.compatible_javacopts key for Android javacopts */
   public static final String ANDROID_JAVACOPTS_KEY = "android";
+  /** The java_toolchain.compatible_javacopts key for proto compilations. */
+  public static final String PROTO_JAVACOPTS_KEY = "proto";
 
   LateBoundLabel<BuildConfiguration> JAVA_TOOLCHAIN =
       new LateBoundLabel<BuildConfiguration>(JAVA_TOOLCHAIN_LABEL, JavaConfiguration.class) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/ProtoJavacOpts.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/ProtoJavacOpts.java
index 86a1a694e7..b3b16f0b79 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/ProtoJavacOpts.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/ProtoJavacOpts.java
@@ -26,15 +26,14 @@ public class ProtoJavacOpts {
 
   /**
    * Returns javacopts for compiling the Java source files generated by the proto compiler.
-   * Ensures that they are compiled so that they can be used by Android targets.
    *
-   * <p>See java_toolchain.compatible_javacopts for the javacopts required for android.
+   * <p>See java_toolchain.compatible_javacopts for the javacopts required for protos.
    */
   public static ImmutableList<String> constructJavacOpts(RuleContext ruleContext) {
     JavaToolchainProvider toolchain = JavaToolchainProvider.fromRuleContext(ruleContext);
     return ImmutableList.<String>builder()
         .addAll(toolchain.getJavacOptions())
-        .addAll(toolchain.getCompatibleJavacOptions(JavaSemantics.ANDROID_JAVACOPTS_KEY))
+        .addAll(toolchain.getCompatibleJavacOptions(JavaSemantics.PROTO_JAVACOPTS_KEY))
         .build();
   }