From 35df715de7cc7b3d3b2ad552b9a90b1cc39df460 Mon Sep 17 00:00:00 2001
From: dbabkin <dbabkin@google.com>
Date: Tue, 26 Jun 2018 05:47:54 -0700
Subject: 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
---
 examples/gen/BUILD                                                    | 4 ++--
 src/BUILD                                                             | 4 ++--
 src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD     | 2 +-
 .../junitrunner/javatests/com/google/testing/junit/runner/BUILD       | 4 ++--
 src/test/shell/bazel/bazel_example_test.sh                            | 4 ++--
 src/tools/singlejar/BUILD                                             | 4 ++--
 third_party/ijar/test/BUILD                                           | 2 +-
 tools/jdk/BUILD                                                       | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/examples/gen/BUILD b/examples/gen/BUILD
index efb0fa4e83..f3b4e632e6 100644
--- a/examples/gen/BUILD
+++ b/examples/gen/BUILD
@@ -2,8 +2,8 @@ package(default_visibility = ["//visibility:public"])
 
 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 551e23b258..c6f81377b1 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -49,9 +49,9 @@ filegroup(
 # 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 a5055017e0..c1f75e5681 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 @@ genrule(
     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 0dca286284..ee22122fef 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 @@ sh_test(
         ":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 cd695c4711..4cc954c685 100755
--- a/src/test/shell/bazel/bazel_example_test.sh
+++ b/src/test/shell/bazel/bazel_example_test.sh
@@ -90,9 +90,9 @@ function test_genrule_and_genquery() {
   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 f1393fa443..530c78a1a6 100644
--- a/src/tools/singlejar/BUILD
+++ b/src/tools/singlejar/BUILD
@@ -310,7 +310,7 @@ sh_test(
     ],
     data = [
         ":singlejar",
-        "//tools/defaults:jdk",
+        "@bazel_tools//tools/jdk:current_java_runtime",
         "@local_jdk//:jar",
     ],
     deps = ["//src/test/shell:bashunit"],
@@ -478,7 +478,7 @@ genrule(
     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 d2ad67ef10..dc77d7eb20 100644
--- a/third_party/ijar/test/BUILD
+++ b/third_party/ijar/test/BUILD
@@ -41,7 +41,7 @@ sh_test(
         # 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 bc7161e370..b364df660a 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -49,7 +49,7 @@ filegroup(
 # *before* the transition.
 alias(
     name = "java_runtime_alias",
-    actual = "//tools/jdk:current_java_runtime",
+    actual = "@bazel_tools//tools/jdk:current_java_runtime",
 )
 
 alias(
-- 
cgit v1.2.3