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

1 files changed, 0 insertions, 39 deletions

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(