Automated rollback of commit 8e006399c42830855da11898db6707ac9f759762.

*** Reason for rollback ***

Made obsolete by https://github.com/bazelbuild/bazel/commit/e734c479956df7a675c61f531d769609d3af3e5d

*** Original change description ***

Blaze now passes an extra flag to JavaBuilder, --testonly, to
mark compilations of test code.

We plan to use this for Error Prone checks that need to distinguish
between test and production code, such as enforcing
@VisibleForTesting.

PiperOrigin-RevId: 183121768

4 files changed, 0 insertions, 87 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
index c425eb4f63..09525dfc28 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
@@ -37,9 +37,7 @@ import com.google.devtools.build.lib.analysis.test.InstrumentedFilesCollector;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
-import com.google.devtools.build.lib.packages.AttributeMap;
 import com.google.devtools.build.lib.rules.java.JavaConfiguration.JavaClasspathMode;
-import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.build.lib.util.FileType;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -233,10 +231,6 @@ public final class JavaCompilationHelper {
     builder.setTargetLabel(
         attributes.getTargetLabel() == null
             ? ruleContext.getLabel() : attributes.getTargetLabel());
-    AttributeMap attributeMap = ruleContext.attributes();
-    if (attributeMap.has("testonly", Type.BOOLEAN)) {
-      builder.setTestOnly(attributeMap.get("testonly", Type.BOOLEAN));
-    }
     getAnalysisEnvironment().registerAction(builder.build());
   }
 
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 e01d2ee711..80136d7942 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
@@ -496,7 +496,6 @@ public final class JavaCompileAction extends SpawnAction {
     private final List<String> processorNames = new ArrayList<>();
     private String ruleKind;
     private Label targetLabel;
-    private boolean testOnly = false;
 
     /**
      * Creates a Builder from an owner and a build configuration.
@@ -731,9 +730,6 @@ public final class JavaCompileAction extends SpawnAction {
           result.addPrefixedLabel("@", targetLabel);
         }
       }
-      if (testOnly) {
-        result.add("--testonly");
-      }
 
       if (!classpathEntries.isEmpty()) {
         result.addExecPaths("--classpath", classpathEntries);
@@ -1015,10 +1011,5 @@ public final class JavaCompileAction extends SpawnAction {
       this.targetLabel = targetLabel;
       return this;
     }
-
-    public Builder setTestOnly(boolean testOnly) {
-      this.testOnly = testOnly;
-      return this;
-    }
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
index 7c4c8f2f70..b7736ae11f 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
@@ -3220,45 +3220,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
   }
 
   @Test
-  public void testAndroidBinaryWithTestOnlySetsTestOnly() throws Exception {
-    scratch.file(
-        "java/com/google/android/foo/BUILD",
-        "android_binary(",
-        "  name = 'foo',",
-        "  srcs = ['Foo.java'],",
-        "  testonly = 1,",
-        "  manifest = 'AndroidManifest.xml',",
-        "  resource_files = ['res/raw/foo.apk'],",
-        "  nocompress_extensions = ['.apk', '.so'],",
-        ")");
-    JavaCompileAction javacAction =
-        (JavaCompileAction)
-            getGeneratingAction(
-                getBinArtifact("libfoo.jar", getConfiguredTarget("//java/com/google/android/foo")));
-
-    assertThat(javacAction.buildCommandLine()).contains("--testonly");
-  }
-
-  @Test
-  public void testAndroidBinaryWithoutTestOnlyDoesntSetTestOnly() throws Exception {
-    scratch.file(
-        "java/com/google/android/foo/BUILD",
-        "android_binary(",
-        "  name = 'foo',",
-        "  srcs = ['Foo.java'],",
-        "  manifest = 'AndroidManifest.xml',",
-        "  resource_files = ['res/raw/foo.apk'],",
-        "  nocompress_extensions = ['.apk', '.so'],",
-        ")");
-    JavaCompileAction javacAction =
-        (JavaCompileAction)
-            getGeneratingAction(
-                getBinArtifact("libfoo.jar", getConfiguredTarget("//java/com/google/android/foo")));
-
-    assertThat(javacAction.buildCommandLine()).doesNotContain("--testonly");
-  }
-
-  @Test
   public void testFeatureFlagPolicyMustContainRuleToUseFeatureFlags() throws Exception {
     reporter.removeHandler(failFastHandler); // expecting an error
     scratch.overwriteFile(
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
index 59b564bb3e..bb1163d80e 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
@@ -1368,39 +1368,6 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
   }
 
   @Test
-  public void testAndroidLibraryWithTestOnlySetsTestOnly() throws Exception {
-    scratch.file(
-        "java/com/google/android/foo/BUILD",
-        "android_library(",
-        "  name = 'foo',",
-        "  srcs = ['Foo.java'],",
-        "  testonly = 1,",
-        ")");
-    JavaCompileAction javacAction =
-        (JavaCompileAction)
-            getGeneratingAction(
-                getBinArtifact("libfoo.jar", getConfiguredTarget("//java/com/google/android/foo")));
-
-    assertThat(javacAction.buildCommandLine()).contains("--testonly");
-  }
-
-  @Test
-  public void testAndroidLibraryWithoutTestOnlyDoesntSetTestOnly() throws Exception {
-    scratch.file(
-        "java/com/google/android/foo/BUILD",
-        "android_library(",
-        "  name = 'foo',",
-        "  srcs = ['Foo.java'],",
-        ")");
-    JavaCompileAction javacAction =
-        (JavaCompileAction)
-            getGeneratingAction(
-                getBinArtifact("libfoo.jar", getConfiguredTarget("//java/com/google/android/foo")));
-
-    assertThat(javacAction.buildCommandLine()).doesNotContain("--testonly");
-  }
-
-  @Test
   public void aapt2ArtifactGenerationWhenSdkIsDefined() throws Exception {
     scratch.file(
         "sdk/BUILD",