Remove the java_executable field from ctx.fragments.jvm .

The same information is accessible as JavaRuntimeInfo.java_executable_exec_path. In order to access that, add an implicit attribute that depends on @bazel_tools//tools/jdk:current_java_runtime, then do

ctx.attr._java_runtime[java_common.JavaRuntimeInfo].java_executable_exec_path .

RELNOTES[INC]: The path to the JVM executable is not accessible anymore as ctx.{fragments,host_fragments}.jvm.java_executable. Use JavaRuntimeInfo.java_executable_exec_path instead.

PiperOrigin-RevId: 177786910

1 files changed, 0 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/Jvm.java b/src/main/java/com/google/devtools/build/lib/rules/java/Jvm.java
index dfdb30f8bb..f99ca11610 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/Jvm.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/Jvm.java
@@ -20,7 +20,6 @@ import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 import com.google.devtools.build.lib.util.OsUtils;
@@ -65,8 +64,6 @@ public final class Jvm extends BuildConfiguration.Fragment {
    * Use {@link JavaCommon#getHostJavaExecutable(RuleContext)} and
    * {@link JavaCommon#getJavaExecutable(RuleContext)} instead.
    */
-  @SkylarkCallable(name = "java_executable", structField = true,
-      doc = "The java executable, i.e. bin/java relative to the Java home.")
   public PathFragment getJavaExecutable() {
     return java;
   }