Automated rollback of commit 11cc89a27544311111473dc7a17522635c2b6e70.

*** Reason for rollback ***

Superceded by https://github.com/bazelbuild/bazel/commit/e734c479956df7a675c61f531d769609d3af3e5d

*** Original change description ***

JavaBuilder accepts a new --testonly argument to mark compilations of
test code.  Error Prone will use these to distinguish between test and
production code, e.g. for enforcing @VisibleForTesting.

PiperOrigin-RevId: 186520809

3 files changed, 4 insertions, 25 deletions

diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BazelJavaBuilder.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BazelJavaBuilder.java
index abbdc315e3..0f478261da 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BazelJavaBuilder.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BazelJavaBuilder.java
@@ -130,8 +130,7 @@ public abstract class BazelJavaBuilder {
   public static JavaLibraryBuildRequest parse(List<String> args)
       throws IOException, InvalidCommandLineException {
     OptionsParser optionsParser = new OptionsParser(args);
-    ImmutableList<BlazeJavaCompilerPlugin> plugins =
-        ImmutableList.of(new ErrorPronePlugin(optionsParser.testOnly()));
+    ImmutableList<BlazeJavaCompilerPlugin> plugins = ImmutableList.of(new ErrorPronePlugin());
     JavaLibraryBuildRequest build =
         new JavaLibraryBuildRequest(optionsParser, plugins, new DependencyModule.Builder());
     build.setJavacOpts(JavacOptions.normalizeOptions(build.getJavacOpts()));
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java
index 24747e9f7b..7646ebeb00 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/OptionsParser.java
@@ -86,8 +86,6 @@ public final class OptionsParser {
   private String targetLabel;
   private String injectingRuleKind;
 
-  private boolean testOnly;
-
   /**
    * Constructs an {@code OptionsParser} from a list of command args. Sets the same JavacRunner for
    * both compilation and annotation processing.
@@ -227,9 +225,6 @@ public final class OptionsParser {
         case "--injecting_rule_kind":
           injectingRuleKind = getArgument(argQueue, arg);
           break;
-        case "--testonly":
-          testOnly = true;
-          break;
         default:
           throw new InvalidCommandLineException("unknown option : '" + arg + "'");
       }
@@ -540,8 +535,4 @@ public final class OptionsParser {
   public String getInjectingRuleKind() {
     return injectingRuleKind;
   }
-
-  public boolean testOnly() {
-    return testOnly;
-  }
 }
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/errorprone/ErrorPronePlugin.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/errorprone/ErrorPronePlugin.java
index 3ebc976257..3bea395bd8 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/errorprone/ErrorPronePlugin.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/errorprone/ErrorPronePlugin.java
@@ -14,7 +14,6 @@
 
 package com.google.devtools.build.buildjar.javac.plugins.errorprone;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.buildjar.InvalidCommandLineException;
 import com.google.devtools.build.buildjar.javac.plugins.BlazeJavaCompilerPlugin;
@@ -42,22 +41,20 @@ import java.util.List;
 public final class ErrorPronePlugin extends BlazeJavaCompilerPlugin {
 
   private final ScannerSupplier scannerSupplier;
-  private final boolean testOnly;
 
   /**
    * Constructs an {@link ErrorPronePlugin} instance with the set of checks that are enabled as
    * errors in open-source Error Prone.
    */
-  public ErrorPronePlugin(boolean testOnly) {
-    this(testOnly, BuiltInCheckerSuppliers.errorChecks());
+  public ErrorPronePlugin() {
+    this(BuiltInCheckerSuppliers.errorChecks());
   }
 
   /**
    * Constructs an {@link ErrorPronePlugin} with the set of checks that are enabled in {@code
    * scannerSupplier}.
    */
-  public ErrorPronePlugin(boolean testOnly, ScannerSupplier scannerSupplier) {
-    this.testOnly = testOnly;
+  public ErrorPronePlugin(ScannerSupplier scannerSupplier) {
     this.scannerSupplier = scannerSupplier;
   }
 
@@ -76,9 +73,6 @@ public final class ErrorPronePlugin extends BlazeJavaCompilerPlugin {
     ImmutableList.Builder<String> epArgs = ImmutableList.<String>builder().addAll(args);
     // allow javacopts that reference unknown error-prone checks
     epArgs.add("-XepIgnoreUnknownCheckNames");
-    if (testOnly()) {
-      epArgs.add(COMPILING_TEST_ONLY_CODE_ARG);
-    }
     return processEpOptions(epArgs.build())
         // TODO(glorioso): This post-filtering shouldn't be needed except that the bazel dependency
         // on error prone doesn't yet know about -XepCompilingTestOnlyCode.
@@ -121,9 +115,4 @@ public final class ErrorPronePlugin extends BlazeJavaCompilerPlugin {
       throw e;
     }
   }
-  
-  @VisibleForTesting
-  public boolean testOnly() {
-    return testOnly;
-  }
 }