From 8cdbc3d3ce0bdd48b83091010106500a5bdd2a92 Mon Sep 17 00:00:00 2001
From: iirina <elenairina@google.com>
Date: Wed, 16 Jan 2019 06:36:56 -0800
Subject: [PATCH] Move jarjar to a checked in deploy jar.

instead of embedding the deploy jar that is built when the bazel binary is built.

This comes in preparation for moving the Java tools to remote repositories (see #6316). This checked in jar will be moved to a remote repository and referenced from there.

Moving the Java tools happens in two phases:

Using checked-in deploy jars/binaries instead of those built when bazel was built
Moving the checked-in jars/binaries to a remote repository and make bazel reference them from there.
This PR addresses the first point for `JarJar`. Doing the move incrementally this way is safer and allows finding bugs earlier. It also allows moving the Java tools code base out of the bazel repository.

We are making this change gradually for each java tool defined in JAVA_TOOLS (found in src/BUILD).

Closes #7143.

PiperOrigin-RevId: 229548071
---
 src/BUILD                                                    | 1 -
 src/create_embedded_tools.py                                 | 2 ++
 .../junitrunner/java/com/google/testing/coverage/BUILD       | 4 ++--
 tools/jdk/BUILD                                              | 5 +++++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/BUILD b/src/BUILD
index 25d00a52514073..e3379c0b491bf3 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -118,7 +118,6 @@ py_binary(
 # The tools Bazel uses to compile Java.
 # TODO(#6316): Gradually remove the targets here.
 JAVA_TOOLS = [
-    "//third_party/jarjar:embedded_tools_srcs",
     "//third_party/java/jdk/langtools:test-srcs",
     "//third_party/java/proguard:embedded_tools",
     "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:srcs",
diff --git a/src/create_embedded_tools.py b/src/create_embedded_tools.py
index 1c47724e4746e5..d95feea02af8cf 100644
--- a/src/create_embedded_tools.py
+++ b/src/create_embedded_tools.py
@@ -34,6 +34,8 @@
     ('*tools/cpp/runfiles/generated_*',
      lambda x: 'tools/cpp/runfiles/' + os.path.basename(x)[len('generated_'):]),
     ('*JavaBuilder*_deploy.jar', lambda x: 'tools/jdk/' + os.path.basename(x)),
+    ('*jarjar_command_deploy.jar',
+     lambda x: 'tools/jdk/jarjar_command_deploy.jar'),
     ('*JacocoCoverage*_deploy.jar',
      lambda x: 'tools/jdk/JacocoCoverage_deploy.jar'),
     ('*turbine_deploy.jar', lambda x: 'tools/jdk/turbine_deploy.jar'),
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 c98c525cd4a66d..3be31af97b56e0 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
@@ -52,7 +52,7 @@ genrule(
     outs = ["JacocoCoverage_jarjar_deploy.jar"],
     cmd = "\n".join([
         "JARJAR=\"$$(mktemp -t bazel.XXXXXXXX)\"",
-        "\"$(JAVA)\" -jar \"$(location //third_party/jarjar:jarjar_bin_deploy.jar)\" process \"$(location :JacocoCoverage.jarjar)\" \"$(location :JacocoCoverage_deploy.jar)\" \"$${JARJAR}\"",
+        "\"$(JAVA)\" -jar \"$(location //third_party/jarjar:jarjar_command_deploy.jar)\" process \"$(location :JacocoCoverage.jarjar)\" \"$(location :JacocoCoverage_deploy.jar)\" \"$${JARJAR}\"",
         "\"$(JAVA)\" -jar \"$(location //src/java_tools/singlejar:SingleJar_deploy.jar)\" --normalize --sources \"$${JARJAR}\" --output \"$@\"",
         "rm -fr \"$${JARJAR}\"",
     ]),
@@ -60,7 +60,7 @@ genrule(
     toolchains = ["@bazel_tools//tools/jdk:current_host_java_runtime"],
     tools = [
         "//src/java_tools/singlejar:SingleJar_deploy.jar",
-        "//third_party/jarjar:jarjar_bin_deploy.jar",
+        "//third_party/jarjar:jarjar_command_deploy.jar",
         "@bazel_tools//tools/jdk:current_host_java_runtime",
     ],
 )
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index c9a32e2862a7fd..651374b6b37cc9 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -311,6 +311,11 @@ java_import(
     jars = [":JacocoCoverage_deploy.jar"],
 )
 
+java_import(
+    name = "JarJar",
+    jars = [":jarjar_command_deploy.jar"],
+)
+
 test_suite(
     name = "windows_tests",
     tags = [