Remove --java_launcher_javatest_migration

--
MOS_MIGRATED_REVID=124381114

3 files changed, 2 insertions, 14 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java
index 15ff6f2011..641aa2bf96 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java
@@ -386,11 +386,6 @@ public class BazelJavaSemantics implements JavaSemantics {
   }
 
   @Override
-  public boolean forceUseJavaLauncherTarget(RuleContext ruleContext) {
-    return false;
-  }
-
-  @Override
   public void addArtifactToJavaTargetAttribute(JavaTargetAttributes.Builder builder,
       Artifact srcArtifact) {
   }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java
index 2ac940be7a..cfcbedbdd5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java
@@ -77,9 +77,8 @@ public abstract class JavaHelper {
     // Blaze flag --java_launcher
     JavaConfiguration javaConfig = ruleContext.getFragment(JavaConfiguration.class);
     if (ruleContext.getRule().isAttrDefined(":java_launcher", BuildType.LABEL)
-        && ((javaConfig.getJavaLauncherLabel() != null
-                && !javaConfig.getJavaLauncherLabel().equals(semantics.getJdkLauncherLabel()))
-            || semantics.forceUseJavaLauncherTarget(ruleContext))) {
+        && javaConfig.getJavaLauncherLabel() != null
+        && !javaConfig.getJavaLauncherLabel().equals(semantics.getJdkLauncherLabel())) {
       return ":java_launcher";
     }
     return null;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
index 5e4c6df0dd..e6d1e90909 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
@@ -327,12 +327,6 @@ public interface JavaSemantics {
   void addDependenciesForRunfiles(RuleContext ruleContext, Builder builder);
 
   /**
-   * Determines if we should enforce the use of the :java_launcher target to determine the java
-   * launcher artifact even if the --java_launcher option was not specified.
-   */
-  boolean forceUseJavaLauncherTarget(RuleContext ruleContext);
-
-  /**
    * Add a source artifact to a {@link JavaTargetAttributes.Builder}. It is called when a source
    * artifact is processed but is not matched by default patterns in the
    * {@link JavaTargetAttributes.Builder#addSourceArtifacts(Iterable)} method. The semantics can