Ignore --reuseJavaCompileActionsFromProtoLibrary now that it is rolled out.

--
PiperOrigin-RevId: 151037295
MOS_MIGRATED_REVID=151037295

2 files changed, 2 insertions, 20 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/ActionReuser.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/ActionReuser.java
index 64913ad37c..bb75a937d5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/ActionReuser.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/ActionReuser.java
@@ -36,7 +36,6 @@ import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider;
 import com.google.devtools.build.lib.rules.java.JavaSkylarkApiProvider;
 import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider;
 import com.google.devtools.build.lib.rules.java.ProtoJavaApiInfoProvider;
-import com.google.devtools.build.lib.rules.proto.ProtoConfiguration;
 
 public class ActionReuser {
 
@@ -48,13 +47,6 @@ public class ActionReuser {
    */
   public static boolean reuseExistingActions(
       ConfiguredTarget base, RuleContext ruleContext, ConfiguredAspect.Builder aspect) {
-    if (!ruleContext
-        .getConfiguration()
-        .getFragment(ProtoConfiguration.class)
-        .reuseJavaCompileActionsFromProtoLibrary()) {
-      return false;
-    }
-
     ProtoJavaApiInfoProvider javaApi = base.getProvider(ProtoJavaApiInfoProvider.class);
     if (javaApi == null) {
       return false;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java
index 3203f53797..36b1785e6a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java
@@ -112,12 +112,9 @@ public class ProtoConfiguration extends Fragment {
 
     @Option(
       name = "reuseJavaCompileActionsFromProtoLibrary",
-      defaultValue = "false",
+      defaultValue = "true",
       category = "experimental",
-      help =
-          "When true, a java_proto_library that wraps a proto_library with java_api_version!=0"
-              + "will reuse its actions. This saves memory and prevents duplicate jars from "
-              + "appearing on a Java compilation's classpath"
+      help = "ignored"
     )
     public boolean reuseJavaCompileActionsFromProtoLibrary;
 
@@ -132,7 +129,6 @@ public class ProtoConfiguration extends Fragment {
       host.protoToolchainForJavaLite = protoToolchainForJavaLite;
       host.protoToolchainForCc = protoToolchainForCc;
       host.strictProtoDeps = strictProtoDeps;
-      host.reuseJavaCompileActionsFromProtoLibrary = reuseJavaCompileActionsFromProtoLibrary;
       return host;
     }
   }
@@ -165,7 +161,6 @@ public class ProtoConfiguration extends Fragment {
   private final Label protoToolchainForJavaLite;
   private final Label protoToolchainForCc;
   private final StrictDepsMode strictProtoDeps;
-  private final boolean reuseJavaCompileActionsFromProtoLibrary;
 
   public ProtoConfiguration(Options options) {
     this.experimentalProtoExtraActions = options.experimentalProtoExtraActions;
@@ -175,7 +170,6 @@ public class ProtoConfiguration extends Fragment {
     this.protoToolchainForJavaLite = options.protoToolchainForJavaLite;
     this.protoToolchainForCc = options.protoToolchainForCc;
     this.strictProtoDeps = options.strictProtoDeps;
-    this.reuseJavaCompileActionsFromProtoLibrary = options.reuseJavaCompileActionsFromProtoLibrary;
   }
 
   public ImmutableList<String> protocOpts() {
@@ -210,8 +204,4 @@ public class ProtoConfiguration extends Fragment {
   public StrictDepsMode strictProtoDeps() {
     return strictProtoDeps;
   }
-
-  public boolean reuseJavaCompileActionsFromProtoLibrary() {
-    return reuseJavaCompileActionsFromProtoLibrary;
-  }
 }