Merge #331 by ted-xie: Copy java stub template from rules_java

ted-xie · copybara-github · commit fafafd1932e5 · 2025-01-30T11:32:06.000-08:00
The stub template will no longer be publicly exposed. The path forward is for remaining users to fork it from rules_java. Closes #331 Fixes #328. COPYBARA_INTEGRATE_REVIEW=#331 from ted-xie:java_stub 4477432 PiperOrigin-RevId: 721461462 Change-Id: I6e777d0e610df30b6f28526d4ab1d2bd7e69be91
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -4,8 +4,7 @@ matrix:
   bazel: [
     7.4.1,
     8.0.0rc7,
-# Temporarily disabled until java_stub_template.txt is public
-#    last_green,
+    last_green,
   ]
 
 tools_flags: &tools_flags
diff --git a/toolchains/android/toolchain.bzl b/toolchains/android/toolchain.bzl
@@ -179,7 +179,7 @@ _ATTRS = dict(
     java_stub = attr.label(
         allow_files = True,
         # used in android_local_test
-        default = "@bazel_tools//tools/java:java_stub_template.txt",
+        default = "//tools/jdk:java_stub_template.txt",
     ),
     jdeps_tool = attr.label(
         allow_files = True,
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
@@ -86,3 +86,5 @@ alias(
     actual = "@rules_java//toolchains:current_host_java_runtime",
     visibility = ["//visibility:public"],
 )
+
+exports_files(["java_stub_template.txt"])
diff --git a/tools/jdk/java_stub_template.txt b/tools/jdk/java_stub_template.txt

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@ matrix:`
`4`	`4`	`bazel: [`
`5`	`5`	`7.4.1,`
`6`	`6`	`8.0.0rc7,`
`7`		`-# Temporarily disabled until java_stub_template.txt is public`
`8`		`-# last_green,`
	`7`	`+ last_green,`
`9`	`8`	`]`
`10`	`9`
`11`	`10`	`tools_flags: &tools_flags`
Original file line number	Diff line number	Diff line change
`@@ -86,3 +86,5 @@ alias(`
`86`	`86`	`actual = "@rules_java//toolchains:current_host_java_runtime",`
`87`	`87`	`visibility = ["//visibility:public"],`
`88`	`88`	`)`
	`89`	`+`
	`90`	`+exports_files(["java_stub_template.txt"])`