Rollback of commit 0fe34924b5e5282b5e2895761f11ad77bccebdba.

*** Reason for rollback ***

Causes a dependency cycle for java targets:
[]

*** Original change description ***

Enable the Java launcher by default

--
MOS_MIGRATED_REVID=128638289

2 files changed, 6 insertions, 6 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index 0dc24e1cef..bb630a3c55 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -380,7 +380,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
    *
    * @throws IllegalArgumentException
    */
-  protected void useConfiguration(String... args) throws Exception {
+  protected final void useConfiguration(String... args) throws Exception {
     masterConfig = createConfigurations(args);
     targetConfig = getTargetConfiguration();
     configurationArgs = Arrays.asList(args);
diff --git a/src/test/java/com/google/devtools/build/lib/rules/filegroup/FilegroupConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/filegroup/FilegroupConfiguredTargetTest.java
index 5b60e0f33c..a466c9534c 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/filegroup/FilegroupConfiguredTargetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/filegroup/FilegroupConfiguredTargetTest.java
@@ -25,12 +25,14 @@ import com.google.devtools.build.lib.analysis.OutputGroupProvider;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.rules.java.JavaSemantics;
 import com.google.devtools.build.lib.util.FileType;
-import java.io.IOException;
-import java.util.Arrays;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+import java.io.IOException;
+import java.util.Arrays;
+
 /**
  * Tests for {@link Filegroup}.
  */
@@ -50,11 +52,9 @@ public class FilegroupConfiguredTargetTest extends BuildViewTestCase {
 
   @Test
   public void testDependencyGraph() throws Exception {
-    scratch.file(
-        "java/com/google/test/BUILD",
+    scratch.file("java/com/google/test/BUILD",
         "java_binary(name  = 'test_app',",
         "    resources = [':data'],",
-        "    create_executable = 0,",
         "    srcs  = ['InputFile.java', 'InputFile2.java'])",
         "filegroup(name  = 'data',",
         "          srcs = ['b.txt', 'a.txt'])");