From c405fb8c0d4826b94f816fbacc5d003f9df6ddf9 Mon Sep 17 00:00:00 2001
From: Yun Peng <pcloudy@google.com>
Date: Tue, 23 Jul 2019 11:47:30 +0200
Subject: [PATCH] Enable tests on Windows and fix singlejar_cc_bin as well

---
 src/test/shell/bazel/bazel_java_tools_test.sh | 6 ------
 third_party/ijar/BUILD                        | 4 ++++
 tools/jdk/BUILD.java_tools                    | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/test/shell/bazel/bazel_java_tools_test.sh b/src/test/shell/bazel/bazel_java_tools_test.sh
index 9a0f008bc27767..e57a1594ef27e1 100755
--- a/src/test/shell/bazel/bazel_java_tools_test.sh
+++ b/src/test/shell/bazel/bazel_java_tools_test.sh
@@ -190,9 +190,6 @@ EOF
 }
 
 function test_java_tools_singlejar_builds() {
-  if "$is_windows"; then
-    echo "Skipping test on Windows." && return
-  fi
   local java_tools_rlocation=$(rlocation io_bazel/src/java_tools_${JAVA_TOOLS_JAVA_VERSION}.zip)
   local java_tools_zip_file_url="file://${java_tools_rlocation}"
   if "$is_windows"; then
@@ -209,9 +206,6 @@ EOF
 }
 
 function test_java_tools_ijar_builds() {
-  if "$is_windows"; then
-    echo "Skipping test on Windows." && return
-  fi
   local java_tools_rlocation=$(rlocation io_bazel/src/java_tools_${JAVA_TOOLS_JAVA_VERSION}.zip)
   local java_tools_zip_file_url="file://${java_tools_rlocation}"
   if "$is_windows"; then
diff --git a/third_party/ijar/BUILD b/third_party/ijar/BUILD
index 4dc1860fd1cd8e..261abbb11102b2 100644
--- a/third_party/ijar/BUILD
+++ b/third_party/ijar/BUILD
@@ -30,7 +30,11 @@ cc_library(
         "//src:__subpackages__",
         "//third_party/ijar:__subpackages__",
         "//tools/test:__pkg__",
+        # TODO(bazel-team): Move this target out of @bazel_tools
         "@local_java_tools//:__pkg__",
+        "@remote_java_tools_linux//:__pkg__",
+        "@remote_java_tools_darwin//:__pkg__",
+        "@remote_java_tools_windows//:__pkg__",
     ],
     deps = [
         ":platform_utils",
diff --git a/tools/jdk/BUILD.java_tools b/tools/jdk/BUILD.java_tools
index 43214c7921e895..71041f94ee0419 100644
--- a/tools/jdk/BUILD.java_tools
+++ b/tools/jdk/BUILD.java_tools
@@ -625,9 +625,9 @@ cc_library(
     strip_include_prefix = "java_tools",
     visibility = ["//visibility:private"],
     deps = [
-        ":cpp_util",
         ":diag",
         ":singlejar_port",
+        "@bazel_tools//src/main/cpp/util",
     ],
 )
 
@@ -672,13 +672,13 @@ cc_library(
     strip_include_prefix = "java_tools",
     deps = [
         ":combiners",
-        ":cpp_util",
         ":diag",
         ":input_jar",
         ":mapped_file",
         ":options",
         ":singlejar_port",
         "//java_tools/zlib",
+        "@bazel_tools//src/main/cpp/util",
     ],
 )