From c1ba3bc5b97a93687e1d63db60bab61cdd1690be Mon Sep 17 00:00:00 2001
From: iirina <elenairina@google.com>
Date: Thu, 7 Mar 2019 11:34:08 +0100
Subject: [PATCH] Remove ijar from the bazel binary.

---
 WORKSPACE                                     |  29 ++-
 scripts/bootstrap/compile.sh                  |   3 +-
 src/BUILD                                     |   3 +-
 src/create_embedded_tools.py                  |   3 +-
 .../build/lib/bazel/rules/java/jdk.WORKSPACE  |  24 +-
 src/test/shell/bazel/bazel_java_test.sh       |   2 +-
 .../bazel/testdata/embedded_tools_srcs_deps   |   1 -
 third_party/java/java_tools/BUILD             |   2 +
 third_party/java/java_tools/BUILD-windows.pkg | 223 ++++++++++++++++++
 .../java/java_tools/BUILD.javalangtools       |  17 +-
 third_party/java/java_tools/BUILD.pkg         | 137 +++++++++++
 third_party/java/java_tools/new_BUILD.pkg     | 122 ++++++++++
 tools/android/BUILD.tools                     |   4 +-
 tools/jdk/BUILD                               |  94 ++++----
 tools/jdk/remote_java_tools_aliases.bzl       |  35 +++
 15 files changed, 629 insertions(+), 70 deletions(-)
 create mode 100644 third_party/java/java_tools/BUILD-windows.pkg
 create mode 100644 tools/jdk/remote_java_tools_aliases.bzl

diff --git a/WORKSPACE b/WORKSPACE
index c70da293e901a2..699708f57b6116 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -106,18 +106,25 @@ distdir_tar(
     archives = [
         "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
         "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz",
-        "java_tools_pkg-0.6.tar.gz",
+        "java_tools_javac10_linux-x86_64-v1.0.tar.gz",
+        "java_tools_javac10_windows-x86_64-v1.0.zip",
+        "java_tools_javac10_darwin-x86_64-v1.0.tar.gz",
     ],
     dirname = "derived/distdir",
     sha256 = {
         "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d",
         "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52",
-        "java_tools_pkg-0.6.tar.gz": "81ed7c5231cd67df95dc4894a5cc32af67d29f388ee7117809531b948e61fca9",
+        "java_tools_javac10_linux-x86_64-v1.0.tar.gz": "1be7503530ce263f6c90139281f45e9ae4f681a8a362b93ad1ddef4f6db74ce5",
+        "java_tools_javac10_windows-x86_64-v1.0.zip": "15840585eb4db06c2ecc0e14749f96a0e253d9cee2c17b724fc60340d35c6a07",
+        "java_tools_javac10_darwin-x86_64-v1.0.tar.gz": "3cce2fa63c47a866eaa61359a8ae3f46da74d5e2ce1eda8ab102586f94b35892",
     },
     urls = {
         "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": ["https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip"],
         "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz": ["https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz"],
-        "java_tools_pkg-0.6.tar.gz": ["https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.6.tar.gz"],
+        "java_tools_pkg-0.5.1.tar.gz": ["https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.5.1.tar.gz"],
+        "java_tools_javac10_linux-x86_64-v1.0.tar.gz": ["https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_linux-x86_64-v1.0.tar.gz"],
+        "java_tools_javac10_windows-x86_64-v1.0.zip": ["https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_windows-x86_64-v1.0.zip"],
+        "java_tools_javac10_darwin-x86_64-v1.0.tar.gz": ["https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_darwin-x86_64-v1.0.tar.gz"],
     },
 )
 
@@ -232,8 +239,8 @@ http_archive(
     sha256 = "4b1468b254a572dbe134cc1fd7c6eab1618a72acd339749ea343bd8f55c3b7eb",
     strip_prefix = "bazel-toolchains-d665ccfa3e9c90fa789671bf4ef5f7c19c5715c4",
     urls = [
-      "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/d665ccfa3e9c90fa789671bf4ef5f7c19c5715c4.tar.gz",
-      "https://github.com/bazelbuild/bazel-toolchains/archive/d665ccfa3e9c90fa789671bf4ef5f7c19c5715c4.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/d665ccfa3e9c90fa789671bf4ef5f7c19c5715c4.tar.gz",
+        "https://github.com/bazelbuild/bazel-toolchains/archive/d665ccfa3e9c90fa789671bf4ef5f7c19c5715c4.tar.gz",
     ],
 )
 
@@ -287,7 +294,9 @@ distdir_tar(
         "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz",
         "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip",
         "jdk10-server-release-1804.tar.xz",
-        "java_tools_pkg-0.6.tar.gz",
+        "java_tools_javac10_linux-x86_64-v1.0.tar.gz",
+        "java_tools_javac10_windows-x86_64-v1.0.zip",
+        "java_tools_javac10_darwin-x86_64-v1.0.tar.gz",
         "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz",
         "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz",
         "zulu11.2.3-jdk11.0.1-win_x64.zip",
@@ -305,7 +314,9 @@ distdir_tar(
         "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz": "e669c9a897413d855b550b4e39d79614392e6fb96f494e8ef99a34297d9d85d3",
         "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip": "c39e7700a8d41794d60985df5a20352435196e78ecbc6a2b30df7be8637bffd5",
         "jdk10-server-release-1804.tar.xz": "b7098b7aaf6ee1ffd4a2d0371a0be26c5a5c87f6aebbe46fe9a92c90583a84be",
-        "java_tools_pkg-0.6.tar.gz": "81ed7c5231cd67df95dc4894a5cc32af67d29f388ee7117809531b948e61fca9",
+        "java_tools_javac10_linux-x86_64-v1.0.tar.gz": "1be7503530ce263f6c90139281f45e9ae4f681a8a362b93ad1ddef4f6db74ce5",
+        "java_tools_javac10_windows-x86_64-v1.0.zip": "15840585eb4db06c2ecc0e14749f96a0e253d9cee2c17b724fc60340d35c6a07",
+        "java_tools_javac10_darwin-x86_64-v1.0.tar.gz": "3cce2fa63c47a866eaa61359a8ae3f46da74d5e2ce1eda8ab102586f94b35892",
         "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz": "232b1c3511f0d26e92582b7c3cc363be7ac633e371854ca2f2e9f2b50eb72a75",
         "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz": "1edf366ee821e5db8e348152fcb337b28dfd6bf0f97943c270dcc6747cedb6cb",
         "zulu11.2.3-jdk11.0.1-win_x64.zip": "8e1e2b8347de6746f3fd1538840dd643201533ab113abc4ed93678e342d28aa3",
@@ -322,7 +333,9 @@ distdir_tar(
         "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz"],
         "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip": ["https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip"],
         "jdk10-server-release-1804.tar.xz": ["https://mirror.bazel.build/openjdk.linaro.org/releases/jdk10-server-release-1804.tar.xz"],
-        "java_tools_pkg-0.6.tar.gz": ["https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.6.tar.gz"],
+        "java_tools_javac10_linux-x86_64-v1.0.tar.gz": ["https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_linux-x86_64-v1.0.tar.gz"],
+        "java_tools_javac10_windows-x86_64-v1.0.zip": ["https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_windows-x86_64-v1.0.zip"],
+        "java_tools_javac10_darwin-x86_64-v1.0.tar.gz": ["https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_darwin-x86_64-v1.0.tar.gz"],
         "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-linux_x64.tar.gz"],
         "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz"],
         "zulu11.2.3-jdk11.0.1-win_x64.zip": ["https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-win_x64.zip"],
diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index 3d53c3f36f926f..4aaa063642ec64 100755
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -264,8 +264,9 @@ EOF
   link_children "${PWD}" tools/python "${BAZEL_TOOLS_REPO}"
   link_children "${PWD}" tools "${BAZEL_TOOLS_REPO}"
 
-  # The BUILD file needed for @remote_java_tools.
+  # The BUILD file needed for @remote_java_tools_*.
   link_file "${PWD}/third_party/java/java_tools/BUILD.pkg" "${BAZEL_TOOLS_REPO}/tools/jdk/BUILD.pkg"
+  link_file "${PWD}/third_party/java/java_tools/BUILD-windows.pkg" "${BAZEL_TOOLS_REPO}/tools/jdk/BUILD-windows.pkg"
 
   # Set up @bazel_tools//platforms properly
   mkdir -p ${BAZEL_TOOLS_REPO}/platforms
diff --git a/src/BUILD b/src/BUILD
index 23612c5c1b5914..2ddfcfa5014925 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -123,9 +123,8 @@ JAVA_TOOLS = [
     "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:srcs",
     "//src/tools/singlejar:embedded_tools",
     "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:embedded_tools",
-    "//third_party/ijar",
+    # TODO(#6316): Move this target to the remote java tools archive.
     "//third_party/ijar:zipper",
-    "//third_party/ijar:embedded_tools",
     "//third_party/java/jacoco:srcs",
 ] + select({
     "//src/conditions:arm": [],
diff --git a/src/create_embedded_tools.py b/src/create_embedded_tools.py
index c4ec47b41174cb..0e3c5b53656cdd 100644
--- a/src/create_embedded_tools.py
+++ b/src/create_embedded_tools.py
@@ -36,13 +36,12 @@
     ('*jarjar_command_deploy.jar',
      lambda x: 'tools/jdk/jarjar_command_deploy.jar'),
     ('*BUILD.pkg', lambda x: 'tools/jdk/BUILD.pkg'),
+    ('*BUILD-windows.pkg', lambda x: 'tools/jdk/BUILD-windows.pkg'),
     ('*BUILD.javalangtools', lambda x: 'third_party/java/jdk/langtools/BUILD'),
     ('*singlejar_local.exe', lambda x: 'tools/jdk/singlejar/singlejar.exe'),
     ('*singlejar_local', lambda x: 'tools/jdk/singlejar/singlejar'),
     ('*launcher.exe', lambda x: 'tools/launcher/launcher.exe'),
     ('*def_parser.exe', lambda x: 'tools/def_parser/def_parser.exe'),
-    ('*ijar.exe', lambda x: 'tools/jdk/ijar/ijar.exe'),
-    ('*ijar', lambda x: 'tools/jdk/ijar/ijar'),
     ('*zipper.exe', lambda x: 'tools/zip/zipper/zipper.exe'),
     ('*zipper', lambda x: 'tools/zip/zipper/zipper'),
     ('*src/objc_tools/*',
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE
index 274debdf0a1899..f5c27361ff6306 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE
@@ -206,11 +206,29 @@ http_archive(
 )
 
 http_archive(
-    name = "remote_java_tools",
+    name = "remote_java_tools_linux",
     build_file = "@bazel_tools//tools/jdk:BUILD.pkg",
-    sha256 = "81ed7c5231cd67df95dc4894a5cc32af67d29f388ee7117809531b948e61fca9",
+    sha256 = "1be7503530ce263f6c90139281f45e9ae4f681a8a362b93ad1ddef4f6db74ce5",
     urls = [
-        "https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.6.tar.gz",
+        "https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_linux-x86_64-v1.0.tar.gz",
+    ],
+)
+
+http_archive(
+    name = "remote_java_tools_windows",
+    build_file = "@bazel_tools//tools/jdk:BUILD-windows.pkg",
+    sha256 = "15840585eb4db06c2ecc0e14749f96a0e253d9cee2c17b724fc60340d35c6a07",
+    urls = [
+        "https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_windows-x86_64-v1.0.zip",
+    ],
+)
+
+http_archive(
+    name = "remote_java_tools_darwin",
+    build_file = "@bazel_tools//tools/jdk:BUILD.pkg",
+    sha256 = "3cce2fa63c47a866eaa61359a8ae3f46da74d5e2ce1eda8ab102586f94b35892",
+    urls = [
+        "https://mirror.bazel.build/bazel_java_tools/java_tools_javac10_darwin-x86_64-v1.0.tar.gz",
     ],
 )
 
diff --git a/src/test/shell/bazel/bazel_java_test.sh b/src/test/shell/bazel/bazel_java_test.sh
index 04d0bd54b77e1d..a29cdbae5efed6 100755
--- a/src/test/shell/bazel/bazel_java_test.sh
+++ b/src/test/shell/bazel/bazel_java_test.sh
@@ -571,7 +571,7 @@ EOF
   cat > java/testrunners/BUILD <<EOF
 java_library(name = "test_runner",
              srcs = ['TestRunner.java'],
-             deps = ['@remote_java_tools//:java_tools/Runner_deploy.jar'],
+             deps = ['@bazel_tools//tools/jdk:TestRunner'],
 )
 
 java_test(name = "Tests",
diff --git a/src/test/shell/bazel/testdata/embedded_tools_srcs_deps b/src/test/shell/bazel/testdata/embedded_tools_srcs_deps
index 45aab3db961f2e..95b4a12738636f 100644
--- a/src/test/shell/bazel/testdata/embedded_tools_srcs_deps
+++ b/src/test/shell/bazel/testdata/embedded_tools_srcs_deps
@@ -6,7 +6,6 @@
 //tools/test:tw_lib
 //tools/test:xml
 //third_party/ijar:zipper
-//third_party/ijar:ijar
 //third_party/ijar:zip
 //third_party/ijar:zlib_client
 //third_party/ijar:platform_utils
diff --git a/third_party/java/java_tools/BUILD b/third_party/java/java_tools/BUILD
index 782a6349905bfb..bb512d08fe6d75 100644
--- a/third_party/java/java_tools/BUILD
+++ b/third_party/java/java_tools/BUILD
@@ -12,6 +12,7 @@ filegroup(
     srcs = [
         "BUILD.javalangtools",
         "BUILD.pkg",
+        "BUILD-windows.pkg",
     ],
 )
 
@@ -25,5 +26,6 @@ filegroup(
         "//conditions:default": [],
     }) + [
         "BUILD.pkg",
+        "BUILD-windows.pkg",
     ],
 )
diff --git a/third_party/java/java_tools/BUILD-windows.pkg b/third_party/java/java_tools/BUILD-windows.pkg
new file mode 100644
index 00000000000000..bfb44d4136df6a
--- /dev/null
+++ b/third_party/java/java_tools/BUILD-windows.pkg
@@ -0,0 +1,223 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])  # Apache 2.0
+
+filegroup(
+    name = "ExperimentalRunner",
+    srcs = ["java_tools/ExperimentalRunner_deploy.jar"],
+)
+
+filegroup(
+    name = "GenClass",
+    srcs = ["java_tools/GenClass_deploy.jar"],
+)
+
+filegroup(
+    name = "JacocoCoverage",
+    srcs = ["java_tools/JacocoCoverage_jarjar_deploy.jar"],
+)
+
+filegroup(
+    name = "JavaBuilder",
+    srcs = ["java_tools/JavaBuilder_deploy.jar"],
+)
+
+filegroup(
+    name = "Runner",
+    srcs = ["java_tools/Runner_deploy.jar"],
+)
+
+filegroup(
+    name = "VanillaJavaBuilder",
+    srcs = ["java_tools/VanillaJavaBuilder_deploy.jar"],
+)
+
+filegroup(
+    name = "SingleJar",
+    srcs = ["java_tools/bazel-singlejar_deploy.jar"],
+)
+
+filegroup(
+    name = "JarJar",
+    srcs = ["java_tools/jarjar_command_deploy.jar"],
+)
+
+filegroup(
+    name = "Turbine",
+    srcs = ["java_tools/turbine_deploy.jar"],
+)
+
+filegroup(
+    name = "TurbineDirect",
+    srcs = ["java_tools/turbine_direct_binary_deploy.jar"],
+)
+
+filegroup(
+    name = "javac_jar",
+    srcs = ["java_tools/javac-9+181-r4173-1.jar"],
+)
+
+filegroup(
+    name = "jdk_compiler_jar",
+    srcs = ["java_tools/jdk_compiler.jar"],
+)
+
+filegroup(
+    name = "java_compiler_jar",
+    srcs = ["java_tools/java_compiler.jar"],
+)
+
+config_setting(
+    name = "remote",
+    values = {"define": "EXECUTOR=remote"},
+    visibility = ["//visibility:public"],
+)
+
+alias(
+  name = "ijar",
+  actual = select({
+      ":remote": ":ijar_cc_binary",
+      "//conditions:default": ":ijar_prebuilt_binary"
+  })
+)
+
+filegroup(
+    name = "ijar_prebuilt_binary",
+    srcs = ["java_tools/ijar/ijar.exe"],
+)
+
+cc_binary(
+    name = "ijar_cc_binary",
+    srcs = [
+        "java_tools/ijar/classfile.cc",
+        "java_tools/ijar/ijar.cc",
+    ],
+    deps = [":zip"],
+)
+
+cc_library(
+    name = "zip",
+    srcs = [
+        "java_tools/ijar/zip.cc",
+        "java_tools/ijar/mapped_file_windows.cc",
+    ],
+    hdrs = [
+        "java_tools/ijar/common.h",
+        "java_tools/ijar/mapped_file.h",
+        "java_tools/ijar/zip.h",
+    ],
+    deps = [
+        ":platform_utils",
+        ":zlib_client",
+        ":errors",
+        ":filesystem",
+        ":logging",
+        ":strings",
+    ],
+)
+
+cc_library(
+    name = "platform_utils",
+    srcs = ["java_tools/ijar/platform_utils.cc"],
+    hdrs = [
+        "java_tools/ijar/common.h",
+        "java_tools/ijar/platform_utils.h",
+    ],
+    visibility = ["//visibility:private"],
+    deps = [
+        ":errors",
+        ":filesystem",
+        ":logging",
+    ],
+)
+
+cc_library(
+    name = "filesystem",
+    srcs = [
+        "java_tools/src/main/cpp/util/file.cc",
+        "java_tools/src/main/cpp/util/path.cc",
+        "java_tools/src/main/cpp/util/file_windows.cc",
+        "java_tools/src/main/cpp/util/path_windows.cc",
+    ],
+    hdrs = [
+        "java_tools/src/main/cpp/util/file.h",
+        "java_tools/src/main/cpp/util/file_platform.h",
+        "java_tools/src/main/cpp/util/path.h",
+        "java_tools/src/main/cpp/util/path_platform.h",
+    ],
+    deps = [
+        ":blaze_exit_code",
+        ":errors",
+        ":logging",
+        ":strings",
+        ":lib-file"
+    ],
+)
+
+
+cc_library(
+    name = "errors",
+    srcs = ["java_tools/src/main/cpp/errors_windows.cc"],
+    hdrs = ["java_tools/src/main/cpp/errors.h"],
+    deps = [
+        ":logging",
+        ":port",
+        ":strings",
+    ],
+)
+
+cc_library(
+    name = "strings",
+    srcs = ["java_tools/src/main/cpp/strings.cc"],
+    hdrs = ["java_tools/src/main/cpp/strings.h"],
+    # Automatically propagate the symbol definition to rules depending on this.
+    defines = [
+        "BLAZE_OPENSOURCE",
+    ],
+    deps = [":blaze_exit_code"],
+)
+
+cc_library(
+    name = "blaze_exit_code",
+    hdrs = ["java_tools/src/main/cpp/exit_code.h"],
+)
+
+
+cc_library(
+    name = "port",
+    srcs = ["java_tools/src/main/cpp/port.cc"],
+    hdrs = ["java_tools/src/main/cpp/port.h"],
+)
+
+cc_library(
+    name = "logging",
+    srcs = ["java_tools/src/main/cpp/logging.cc"],
+    hdrs = ["java_tools/src/main/cpp/logging.h"],
+    deps = [
+        ":blaze_exit_code",
+        ":strings",
+    ],
+)
+
+cc_library(
+    name = "zlib_client",
+    srcs = ["java_tools/ijar/zlib_client.cc"],
+    hdrs = [
+        "java_tools/ijar/common.h",
+        "java_tools/ijar/zlib_client.h",
+    ],
+    deps = ["//java_tools/zlib"],
+)
+
+cc_library(
+    name = "lib-file",
+    srcs = ["java_tools/src/main/native/windows/file.cc"],
+    hdrs = ["java_tools/src/main/native/windows/file.h"],
+    deps = [":lib-util"],
+)
+
+cc_library(
+    name = "lib-util",
+    srcs = ["java_tools/src/main/native/windows/util.cc"],
+    hdrs = ["java_tools/src/main/native/windows/util.h"],
+)
\ No newline at end of file
diff --git a/third_party/java/java_tools/BUILD.javalangtools b/third_party/java/java_tools/BUILD.javalangtools
index 3dd56b956bd811..ca504c9c5a8201 100644
--- a/third_party/java/java_tools/BUILD.javalangtools
+++ b/third_party/java/java_tools/BUILD.javalangtools
@@ -2,18 +2,23 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
 
+load(
+    "//tools/jdk:remote_java_tools_aliases.bzl",
+    "remote_java_tools_filegroup",
+)
+
 
-filegroup(
+remote_java_tools_filegroup(
     name = "javac_jar",
-    srcs = ["@remote_java_tools//:java_tools/javac-9+181-r4173-1.jar"],
+    target = ":java_tools/javac-9+181-r4173-1.jar",
 )
 
-filegroup(
+remote_java_tools_filegroup(
     name = "jdk_compiler_jar",
-    srcs = ["@remote_java_tools//:java_tools/jdk_compiler.jar"],
+    target = ":java_tools/jdk_compiler.jar",
 )
 
-filegroup(
+remote_java_tools_filegroup(
     name = "java_compiler_jar",
-    srcs = ["@remote_java_tools//:java_tools/java_compiler.jar"],
+    target = ":java_tools/java_compiler.jar",
 )
\ No newline at end of file
diff --git a/third_party/java/java_tools/BUILD.pkg b/third_party/java/java_tools/BUILD.pkg
index a39acf9a9d67e0..2f26a4f397748e 100644
--- a/third_party/java/java_tools/BUILD.pkg
+++ b/third_party/java/java_tools/BUILD.pkg
@@ -66,3 +66,140 @@ filegroup(
     name = "java_compiler_jar",
     srcs = ["java_tools/java_compiler.jar"],
 )
+
+config_setting(
+    name = "remote",
+    values = {"define": "EXECUTOR=remote"},
+    visibility = ["//visibility:public"],
+)
+
+alias(
+  name = "ijar",
+  actual = select({
+      ":remote": ":ijar_cc_binary",
+      "//conditions:default": ":ijar_prebuilt_binary"
+  })
+)
+
+filegroup(
+    name = "ijar_prebuilt_binary",
+    srcs = ["java_tools/ijar/ijar"],
+)
+
+cc_binary(
+    name = "ijar_cc_binary",
+    srcs = [
+        "java_tools/ijar/classfile.cc",
+        "java_tools/ijar/ijar.cc",
+    ],
+    deps = [":zip"],
+)
+
+cc_library(
+    name = "zip",
+    srcs = [
+        "java_tools/ijar/zip.cc",
+        "java_tools/ijar/mapped_file_unix.cc",
+    ],
+    hdrs = [
+        "java_tools/ijar/common.h",
+        "java_tools/ijar/mapped_file.h",
+        "java_tools/ijar/zip.h",
+    ],
+    deps = [
+        ":platform_utils",
+        ":zlib_client",
+    ],
+)
+
+cc_library(
+    name = "platform_utils",
+    srcs = ["java_tools/ijar/platform_utils.cc"],
+    hdrs = [
+        "java_tools/ijar/common.h",
+        "java_tools/ijar/platform_utils.h",
+    ],
+    visibility = ["//visibility:private"],
+    deps = [
+        ":errors",
+        ":filesystem",
+        ":logging",
+    ],
+)
+
+cc_library(
+    name = "filesystem",
+    srcs = [
+        "java_tools/src/main/cpp/util/file.cc",
+        "java_tools/src/main/cpp/util/path.cc",
+        "java_tools/src/main/cpp/util/file_posix.cc",
+        "java_tools/src/main/cpp/util/path_posix.cc",
+    ],
+    hdrs = [
+        "java_tools/src/main/cpp/util/file.h",
+        "java_tools/src/main/cpp/util/file_platform.h",
+        "java_tools/src/main/cpp/util/path.h",
+        "java_tools/src/main/cpp/util/path_platform.h",
+    ],
+    deps = [
+        ":blaze_exit_code",
+        ":errors",
+        ":logging",
+        ":strings",
+    ],
+)
+
+
+cc_library(
+    name = "errors",
+    srcs = ["java_tools/src/main/cpp/errors_posix.cc"],
+    hdrs = ["java_tools/src/main/cpp/errors.h"],
+    deps = [
+        ":logging",
+        ":port",
+        ":strings",
+    ],
+)
+
+cc_library(
+    name = "strings",
+    srcs = ["java_tools/src/main/cpp/strings.cc"],
+    hdrs = ["java_tools/src/main/cpp/strings.h"],
+    # Automatically propagate the symbol definition to rules depending on this.
+    defines = [
+        "BLAZE_OPENSOURCE",
+    ],
+    deps = [":blaze_exit_code"],
+)
+
+cc_library(
+    name = "blaze_exit_code",
+    hdrs = ["java_tools/src/main/cpp/exit_code.h"],
+)
+
+
+cc_library(
+    name = "port",
+    srcs = ["java_tools/src/main/cpp/port.cc"],
+    hdrs = ["java_tools/src/main/cpp/port.h"],
+)
+
+cc_library(
+    name = "logging",
+    srcs = ["java_tools/src/main/cpp/logging.cc"],
+    hdrs = ["java_tools/src/main/cpp/logging.h"],
+    deps = [
+        ":blaze_exit_code",
+        ":strings",
+    ],
+)
+
+cc_library(
+    name = "zlib_client",
+    srcs = ["java_tools/ijar/zlib_client.cc"],
+    hdrs = [
+        "java_tools/ijar/common.h",
+        "java_tools/ijar/zlib_client.h",
+    ],
+    deps = ["//java_tools/zlib"],
+)
diff --git a/third_party/java/java_tools/new_BUILD.pkg b/third_party/java/java_tools/new_BUILD.pkg
index 66ffd5fb6cd8be..31e4cc097c96ab 100644
--- a/third_party/java/java_tools/new_BUILD.pkg
+++ b/third_party/java/java_tools/new_BUILD.pkg
@@ -67,3 +67,125 @@ filegroup(
     srcs = ["java_tools/java_compiler.jar"],
 )
 
+filegroup(
+    name = "ijar_binary",
+    srcs = ["java_tools/ijar/ijar"],
+)
+
+cc_binary(
+    name = "ijar",
+    srcs = [
+        "java_tools/ijar/classfile.cc",
+        "java_tools/ijar/ijar.cc",
+    ],
+    deps = [":zip"],
+)
+
+cc_library(
+    name = "zip",
+    srcs = [
+        "java_tools/ijar/zip.cc",
+        "java_tools/ijar/mapped_file_unix.cc",
+    ],
+    hdrs = [
+        "java_tools/ijar/common.h",
+        "java_tools/ijar/mapped_file.h",
+        "java_tools/ijar/zip.h",
+    ],
+    deps = [
+        ":platform_utils",
+        ":zlib_client",
+    ],
+)
+
+cc_library(
+    name = "platform_utils",
+    srcs = ["java_tools/ijar/platform_utils.cc"],
+    hdrs = [
+        "java_tools/ijar/common.h",
+        "java_tools/ijar/platform_utils.h",
+    ],
+    visibility = ["//visibility:private"],
+    deps = [
+        ":errors",
+        ":filesystem",
+        ":logging",
+    ],
+)
+
+cc_library(
+    name = "filesystem",
+    srcs = [
+        "java_tools/src/main/cpp/util/file.cc",
+        "java_tools/src/main/cpp/util/path.cc",
+        "java_tools/src/main/cpp/util/file_posix.cc",
+        "java_tools/src/main/cpp/util/path_posix.cc",
+    ],
+    hdrs = [
+        "java_tools/src/main/cpp/util/file.h",
+        "java_tools/src/main/cpp/util/file_platform.h",
+        "java_tools/src/main/cpp/util/path.h",
+        "java_tools/src/main/cpp/util/path_platform.h",
+    ],
+    deps = [
+        ":blaze_exit_code",
+        ":errors",
+        ":logging",
+        ":strings",
+    ],
+)
+
+
+cc_library(
+    name = "errors",
+    srcs = ["java_tools/src/main/cpp/errors_posix.cc"],
+    hdrs = ["java_tools/src/main/cpp/errors.h"],
+    deps = [
+        ":logging",
+        ":port",
+        ":strings",
+    ],
+)
+
+cc_library(
+    name = "strings",
+    srcs = ["java_tools/src/main/cpp/strings.cc"],
+    hdrs = ["java_tools/src/main/cpp/strings.h"],
+    # Automatically propagate the symbol definition to rules depending on this.
+    defines = [
+        "BLAZE_OPENSOURCE",
+    ],
+    deps = [":blaze_exit_code"],
+)
+
+cc_library(
+    name = "blaze_exit_code",
+    hdrs = ["java_tools/src/main/cpp/exit_code.h"],
+)
+
+
+cc_library(
+    name = "port",
+    srcs = ["java_tools/src/main/cpp/port.cc"],
+    hdrs = ["java_tools/src/main/cpp/port.h"],
+)
+
+cc_library(
+    name = "logging",
+    srcs = ["java_tools/src/main/cpp/logging.cc"],
+    hdrs = ["java_tools/src/main/cpp/logging.h"],
+    deps = [
+        ":blaze_exit_code",
+        ":strings",
+    ],
+)
+
+cc_library(
+    name = "zlib_client",
+    srcs = ["java_tools/ijar/zlib_client.cc"],
+    hdrs = [
+        "java_tools/ijar/common.h",
+        "java_tools/ijar/zlib_client.h",
+    ],
+    deps = ["//java_tools/zlib"],
+)
\ No newline at end of file
diff --git a/tools/android/BUILD.tools b/tools/android/BUILD.tools
index dcd57ebd2904f2..acca19a3b23439 100644
--- a/tools/android/BUILD.tools
+++ b/tools/android/BUILD.tools
@@ -108,8 +108,8 @@ genrule(
     name = "ijar_desugared_java8_legacy_libs",
     srcs = ["desugared_java8_legacy_libs"],
     outs = ["desugared_java8_legacy_libs-ijar.jar"],
-    cmd = "$(location //third_party/ijar) $< $@",
-    tools = ["//third_party/ijar"],
+    cmd = "$(location @bazel_tools//tools/jdk:ijar) $< $@",
+    tools = ["@bazel_tools//tools/jdk:ijar"],
     visibility = ["//visibility:private"],
 )
 
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index b3962fa33fcd3d..2ad72ba99fe150 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -13,6 +13,11 @@ load(
     "legacy_java_toolchain_alias",
     "legacy_java_runtime_alias",
 )
+load(
+    "//tools/jdk:remote_java_tools_aliases.bzl",
+    "remote_java_tools_filegroup",
+    "remote_java_tools_java_import",
+)
 
 package(default_visibility = ["//visibility:public"])
 
@@ -126,12 +131,9 @@ alias(
 # On Windows, executables end in ".exe", but the label we reach it through
 # must be platform-independent. Thus, we create a little filegroup that
 # contains the appropriate platform-dependent file.
-filegroup(
+remote_java_tools_filegroup(
     name = "ijar",
-    srcs = select({
-        "//src/conditions:remote": ["//third_party/ijar:ijar"],
-        "//conditions:default": glob(["ijar/*"]),
-    }),
+    target = ":ijar",
 )
 
 # On Windows, Java implementation of singlejar is used. We create a little
@@ -148,101 +150,104 @@ filegroup(
     }),
 )
 
-exports_files(["BUILD.pkg"])
+exports_files([
+    "BUILD.pkg",
+    "BUILD-windows.pkg",
+])
 
-filegroup(
+remote_java_tools_filegroup(
     name = "genclass",
-    srcs = ["@remote_java_tools//:GenClass"],
+    target = ":GenClass",
 )
 
-filegroup(
+remote_java_tools_filegroup(
     name = "GenClass_deploy.jar",
-    srcs = ["@remote_java_tools//:java_tools/GenClass_deploy.jar"],
+    target = ":java_tools/GenClass_deploy.jar",
 )
 
-filegroup(
+remote_java_tools_filegroup(
     name = "bazel-singlejar_deploy.jar",
-    srcs = ["@remote_java_tools//:java_tools/bazel-singlejar_deploy.jar"],
+    target = ":java_tools/bazel-singlejar_deploy.jar",
 )
 
-filegroup(
+remote_java_tools_filegroup(
     name = "turbine",
-    srcs = ["@remote_java_tools//:Turbine"],
+    target = ":Turbine",
 )
 
-filegroup(
+remote_java_tools_filegroup(
     name = "turbine_deploy.jar",
-    srcs = ["@remote_java_tools//:java_tools/turbine_deploy.jar"],
+    target = ":java_tools/turbine_deploy.jar",
 )
 
-filegroup(
+remote_java_tools_filegroup(
     name = "turbine_direct",
-    srcs = ["@remote_java_tools//:TurbineDirect"],
+    target = ":TurbineDirect",
 )
 
-filegroup(
+remote_java_tools_filegroup(
     name = "turbine_direct_binary_deploy.jar",
-    srcs = ["@remote_java_tools//:java_tools/turbine_direct_binary_deploy.jar"],
+    target = ":java_tools/turbine_direct_binary_deploy.jar",
 )
 
-filegroup(
+remote_java_tools_filegroup(
     name = "javabuilder",
-    srcs = ["@remote_java_tools//:JavaBuilder"],
+    target = ":JavaBuilder",
 )
 
-filegroup(
+remote_java_tools_filegroup(
     name = "JavaBuilder_deploy.jar",
-    srcs = ["@remote_java_tools//:java_tools/JavaBuilder_deploy.jar"],
+    target = ":java_tools/JavaBuilder_deploy.jar",
 )
 
-filegroup(
+remote_java_tools_filegroup(
     name = "vanillajavabuilder",
-    srcs = ["@remote_java_tools//:VanillaJavaBuilder"],
+    target = ":VanillaJavaBuilder",
 )
 
-filegroup(
+remote_java_tools_filegroup(
     name = "javac_jar",
-    srcs = ["@remote_java_tools//:javac_jar"],
+    target = ":javac_jar",
 )
 
-filegroup(
+remote_java_tools_filegroup(
     name = "jdk_compiler_jar",
-    srcs = ["@remote_java_tools//:jdk_compiler_jar"],
+    target = ":jdk_compiler_jar",
 )
 
-filegroup(
+remote_java_tools_filegroup(
     name = "java_compiler_jar",
-    srcs = ["@remote_java_tools//:java_compiler_jar"],
+    target = ":java_compiler_jar",
 )
 
-java_import(
+remote_java_tools_java_import(
     name = "JacocoCoverageRunner",
-    jars = ["@remote_java_tools//:java_tools/JacocoCoverage_jarjar_deploy.jar"],
+    target = ":java_tools/JacocoCoverage_jarjar_deploy.jar",
 )
 
-java_import(
+remote_java_tools_java_import(
     name = "JacocoCoverage",
-    jars = ["@remote_java_tools//:java_tools/JacocoCoverage_jarjar_deploy.jar"],
+    target = ":java_tools/JacocoCoverage_jarjar_deploy.jar",
 )
 
-java_import(
+remote_java_tools_java_import(
     name = "TestRunner",
-    jars = ["@remote_java_tools//:java_tools/Runner_deploy.jar"],
+    target = ":java_tools/Runner_deploy.jar",
 )
 
-filegroup(
+remote_java_tools_filegroup(
     name = "TestRunner_deploy.jar",
-    srcs = ["@remote_java_tools//:java_tools/Runner_deploy.jar"],
+    target = ":java_tools/Runner_deploy.jar",
 )
 
-java_import(
+remote_java_tools_java_import(
     name = "ExperimentalTestRunner",
-    jars = ["@remote_java_tools//:java_tools/ExperimentalRunner_deploy.jar"],
+    target = ":java_tools/ExperimentalRunner_deploy.jar",
 )
 
-filegroup(
+remote_java_tools_filegroup(
     name = "ExperimentalRunner_deploy.jar",
-    srcs = ["@remote_java_tools//:java_tools/ExperimentalRunner_deploy.jar"],
+    target = ":java_tools/ExperimentalRunner_deploy.jar",
 )
 
 BOOTCLASS_JARS = [
@@ -366,6 +371,7 @@ filegroup(
         "proguard_whitelister.py",
         "proguard_whitelister_test.py",
         "proguard_whitelister_test_input.cfg",
+        "remote_java_tools_aliases.bzl",
         "toolchain_utils.bzl",
     ],
 )
diff --git a/tools/jdk/remote_java_tools_aliases.bzl b/tools/jdk/remote_java_tools_aliases.bzl
new file mode 100644
index 00000000000000..df33aa39c9fc20
--- /dev/null
+++ b/tools/jdk/remote_java_tools_aliases.bzl
@@ -0,0 +1,35 @@
+# Copyright 2017 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+def _get_args(target, attr, **kwargs):
+    workspace_target_dict = {
+        "//src/conditions:linux_x86_64": ["@remote_java_tools_linux//" + target],
+        "//src/conditions:linux_aarch64": ["@remote_java_tools_linux//" + target],
+        "//src/conditions:darwin": ["@remote_java_tools_darwin//" + target],
+        "//src/conditions:darwin_x86_64": ["@remote_java_tools_darwin//" + target],
+        "//src/conditions:windows": ["@remote_java_tools_windows//" + target],
+        "//conditions:default": ["@remote_java_tools_linux//" + target],
+    }
+    workspace_target_select = select(workspace_target_dict)
+    args = dict({attr: workspace_target_select})
+    args.update(kwargs)
+    return args
+
+def remote_java_tools_filegroup(name, target, **kwargs):
+    args = _get_args(target, "srcs", **kwargs)
+    native.filegroup(name = name, **args)
+
+def remote_java_tools_java_import(name, target, **kwargs):
+    args = _get_args(target, "jars", **kwargs)
+    native.java_import(name = name, **args)