Skip to content

Commit

Permalink
Merge #331 by ted-xie: Copy java stub template from rules_java
Browse files Browse the repository at this point in the history
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
  • Loading branch information
ted-xie authored and copybara-github committed Jan 30, 2025
1 parent 77251c8 commit fafafd1
Show file tree
Hide file tree
Showing 4 changed files with 414 additions and 3 deletions.
3 changes: 1 addition & 2 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion toolchains/android/toolchain.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions tools/jdk/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,5 @@ alias(
actual = "@rules_java//toolchains:current_host_java_runtime",
visibility = ["//visibility:public"],
)

exports_files(["java_stub_template.txt"])
Loading

0 comments on commit fafafd1

Please sign in to comment.