Add make variables for runfiles location of $(JAVABASE) to support --no_legacy_external_runfiles. (#272)

Add make variables for runfiles locations of `$(JAVA)` and `$(JAVABASE)`. These are needed to access these paths when passing them to test rules via `env` when using `--no_legacy_external_runfiles`. The original make variables still work in exec contexts such as genrules.

Closes #272

COPYBARA_INTEGRATE_REVIEW=#272 from thirtyseven:patch-2 438b659
PiperOrigin-RevId: 726438570
Change-Id: I74e0815e1e71547c653a7b53bff801c62392f075

Author: thirtyseven

java/common/rules/java_runtime.bzl

@@ -152,6 +152,8 @@ def _java_runtime_rule_impl(ctx):
         platform_common.TemplateVariableInfo({
             "JAVA": java_binary_exec_path,
             "JAVABASE": java_home,
+            "JAVA_ROOTPATH": java_binary_runfiles_path,
+            "JAVABASE_ROOTPATH": java_home_runfiles_path,
         }),
         ToolchainInfo(java_runtime = java_runtime_info),
     ]

test/repo/BUILD.bazel

@@ -1,5 +1,6 @@
 load("@rules_java//java:defs.bzl", "java_binary", "java_library", "java_test")  # copybara-use-repo-external-label
 load("@rules_java//toolchains:default_java_toolchain.bzl", "default_java_toolchain")  # copybara-use-repo-external-label
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 java_library(
     name = "lib",
@@ -24,6 +25,28 @@ java_test(
     ],
 )
 
+genrule(
+    name = "MakeVarGenruleTest",
+    outs = ["MakeVarGenruleTestSuccess"],
+    cmd = "test -f $(JAVA) && test -d $(JAVABASE) && touch $@",
+    toolchains = ["@rules_java//toolchains:current_java_runtime"],
+    tools = ["@rules_java//toolchains:current_java_runtime"],
+)
+
+sh_test(
+    name = "MakeVarTest",
+    srcs = ["src/MakeVarTest.sh"],
+    data = [
+        "MakeVarGenruleTestSuccess",
+        "@rules_java//toolchains:current_java_runtime",
+    ],
+    env = {
+        "JAVA_ROOTPATH": "$(JAVA_ROOTPATH)",
+        "JAVABASE_ROOTPATH": "$(JAVABASE_ROOTPATH)",
+    },
+    toolchains = ["@rules_java//toolchains:current_java_runtime"],
+)
+
 default_java_toolchain(
     name = "my_funky_toolchain",
     bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath"],

test/repo/MODULE.bazel

@@ -44,3 +44,5 @@ use_repo(
 )
 
 register_toolchains("//:all")
+
+bazel_dep(name = "rules_shell", version = "0.4.0", dev_dependency = True)

test/repo/WORKSPACE

@@ -25,3 +25,18 @@ http_jar(
     name = "my_jar",
     urls = ["file:///tmp/my_jar.jar"],
 )
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "rules_shell",
+    sha256 = "3e114424a5c7e4fd43e0133cc6ecdfe54e45ae8affa14fadd839f29901424043",
+    strip_prefix = "rules_shell-0.4.0",
+    url = "https://github.com/bazelbuild/rules_shell/releases/download/v0.4.0/rules_shell-v0.4.0.tar.gz",
+)
+
+load("@rules_shell//shell:repositories.bzl", "rules_shell_dependencies", "rules_shell_toolchains")
+
+rules_shell_dependencies()
+
+rules_shell_toolchains()

test/repo/src/MakeVarTest.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+if [ ! -x "$JAVABASE_ROOTPATH/bin/java" ]; then
+  echo '$JAVABASE_RUNFILES does not point to a working JRE' && exit 1
+fi
+
+echo $JAVA_ROOTPATH
+if [ ! -x "$JAVA_ROOTPATH" ]; then
+  echo '$JAVA_ROOTPATH does not exist' && exit 1
+fi

toolchains/java_toolchain_alias.bzl

@@ -26,6 +26,8 @@ def _java_runtime_alias(ctx):
         platform_common.TemplateVariableInfo({
             "JAVA": str(toolchain.java_executable_exec_path),
             "JAVABASE": str(toolchain.java_home),
+            "JAVA_ROOTPATH": str(toolchain.java_executable_runfiles_path),
+            "JAVABASE_ROOTPATH": str(toolchain.java_home_runfiles_path),
         }),
         # See b/65239471 for related discussion of handling toolchain runfiles/data.
         DefaultInfo(