Replace //tools/defaults:jdk to //tools/jdk:*
As //tools/defaults will be deprecated soon. All usages of //tools/defaults:jdk and //tools/defaults:java_toolchain should be replaced by corresponding targets in //tools/jdk/BUILD package
RELNOTES:none
PiperOrigin-RevId: 202114489
diff --git a/examples/gen/BUILD b/examples/gen/BUILD
index efb0fa4..f3b4e63 100644
--- a/examples/gen/BUILD
+++ b/examples/gen/BUILD
@@ -2,8 +2,8 @@
genquery(
name = "genquery",
- expression = "deps(//tools/defaults:jdk)",
- scope = ["//tools/defaults:jdk"],
+ expression = "deps(@bazel_tools//tools/jdk:current_java_runtime)",
+ scope = ["@bazel_tools//tools/jdk:current_java_runtime"],
)
genrule(
diff --git a/src/BUILD b/src/BUILD
index 551e23b..c6f8137 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -49,9 +49,9 @@
# so we cannot get it from the command-line options.
genquery(
name = "java_toolchain_content",
- expression = "kind(java_toolchain, deps(//tools/defaults:java_toolchain))",
+ expression = "kind(java_toolchain, deps(@bazel_tools//tools/jdk:current_java_toolchain))",
opts = ["--output=xml"],
- scope = ["//tools/defaults:java_toolchain"],
+ scope = ["@bazel_tools//tools/jdk:current_java_toolchain"],
)
# Create dummy tools so we can do select to prevent building iOS target on
diff --git a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
index a505501..c1f75e5 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
@@ -74,6 +74,6 @@
tools = [
"//src/java_tools/singlejar:SingleJar_deploy.jar",
"//third_party/jarjar:jarjar_bin_deploy.jar",
- "//tools/defaults:jdk",
+ "@bazel_tools//tools/jdk:current_host_java_runtime",
],
)
diff --git a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD
index 0dca286..ee22122 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD
@@ -121,9 +121,9 @@
":TestbedBinary_deploy.jar",
"//src/test/shell:bashunit",
"//src/test/shell:unittest.bash",
- "//tools/defaults:jdk",
+ "@bazel_tools//tools/jdk:current_java_runtime",
],
- toolchains = ["//tools/jdk:current_java_runtime"],
+ toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"],
)
exports_files([
diff --git a/src/test/shell/bazel/bazel_example_test.sh b/src/test/shell/bazel/bazel_example_test.sh
index cd695c4..4cc954c 100755
--- a/src/test/shell/bazel/bazel_example_test.sh
+++ b/src/test/shell/bazel/bazel_example_test.sh
@@ -90,9 +90,9 @@
diff $want ./bazel-bin/examples/gen/genquery \
|| fail "genrule and genquery output differs"
- grep -qE "^//tools/jdk:jdk$" $want || {
+ grep -qE "^@bazel_tools//tools/jdk:jdk$" $want || {
cat $want
- fail "//tools/jdk:jdk not found in genquery output"
+ fail "@bazel_tools//tools/jdk:jdk not found in genquery output"
}
}
diff --git a/src/tools/singlejar/BUILD b/src/tools/singlejar/BUILD
index f1393fa..530c78a 100644
--- a/src/tools/singlejar/BUILD
+++ b/src/tools/singlejar/BUILD
@@ -310,7 +310,7 @@
],
data = [
":singlejar",
- "//tools/defaults:jdk",
+ "@bazel_tools//tools/jdk:current_java_runtime",
"@local_jdk//:jar",
],
deps = ["//src/test/shell:bashunit"],
@@ -478,7 +478,7 @@
name = "stored_jar",
srcs = [
"output_jar.cc",
- "//tools/defaults:jdk",
+ "@bazel_tools//tools/jdk:current_java_runtime",
],
outs = ["stored.jar"],
cmd = "$(location @local_jdk//:jar) -0cf \"$@\" $(location :output_jar.cc)",
diff --git a/third_party/ijar/test/BUILD b/third_party/ijar/test/BUILD
index d2ad67e..dc77d7e 100644
--- a/third_party/ijar/test/BUILD
+++ b/third_party/ijar/test/BUILD
@@ -41,7 +41,7 @@
# Intentionally bad test JAR: file count in central directory
# wrong.
"libwrongcentraldir.jar",
- "//tools/defaults:jdk",
+ "@bazel_tools//tools/jdk:current_java_runtime",
"//tools/jdk:langtools",
],
shard_count = 5,
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index bc7161e..b364df6 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -49,7 +49,7 @@
# *before* the transition.
alias(
name = "java_runtime_alias",
- actual = "//tools/jdk:current_java_runtime",
+ actual = "@bazel_tools//tools/jdk:current_java_runtime",
)
alias(
