Remove the reference to //tools/jdk:no_launcher, since that doesn't …

…seem to actually work. PiperOrigin-RevId: 241009928
luca-digrazia · Sep 4, 2022 · 4adc582 · 4adc582
1 parent d7b5ce4
commit 4adc582
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/...el/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java b/...el/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java
@@ -41,7 +41,6 @@
 import com.google.devtools.build.lib.packages.RuleClass.PackageNameConstraint;
 import com.google.devtools.build.lib.packages.SkylarkProviderIdentifier;
 import com.google.devtools.build.lib.packages.TriState;
-import com.google.devtools.build.lib.rules.cpp.CcBinary.CcLauncherInfo;
 import com.google.devtools.build.lib.rules.cpp.CcInfo;
 import com.google.devtools.build.lib.rules.java.JavaInfo;
 import com.google.devtools.build.lib.rules.java.JavaRuleClasses.IjarBaseRule;
@@ -430,8 +429,7 @@ <li>If you are using any other launcher, native (C++) dependencies are staticall
           .add(
               attr("launcher", LABEL)
                   .allowedFileTypes(FileTypeSet.NO_FILE)
-                  .mandatoryProviders(
-                      SkylarkProviderIdentifier.forKey(CcLauncherInfo.PROVIDER.getKey())))
+                  .allowedRuleClasses("cc_binary"))
           .add(attr(":java_launcher", LABEL).value(JavaSemantics.JAVA_LAUNCHER)) // blaze flag
           .add(
               attr("$launcher", LABEL)

diff --git a/...a/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java b/...a/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java
@@ -141,9 +141,6 @@ public static PathFragment getJavaResourcePath(
    * will ever be used.
    */
   public static boolean isJdkLauncher(RuleContext ruleContext, Label label) {
-    if (!ruleContext.attributes().has("$no_launcher")) {
-      return false;
-    }
     List<Label> noLauncherAttribute =
         ruleContext.attributes().get("$no_launcher", NODEP_LABEL_LIST);
     return noLauncherAttribute != null && noLauncherAttribute.contains(label);