commit 35df715de7cc7b3d3b2ad552b9a90b1cc39df460
author dbabkin <dbabkin@google.com> Tue Jun 26 05:47:54 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Tue Jun 26 05:49:22 2018 -0700
tree ff4c94ae4b24316e665866b00ce20c327573a84d
parent e177fbdf74e2c95c061a1a613ef2f2780ac76c79

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

src/BUILD

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

src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD

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",
     ],
 )

src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD

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([

src/test/shell/bazel/bazel_example_test.sh

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"
   }
 }
 

src/tools/singlejar/BUILD

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)",