Embed a prebuilt jarjar into Bazel so that Android builds work again.
Fixes #2848.
RELNOTES: None.
PiperOrigin-RevId: 153692641
diff --git a/src/BUILD b/src/BUILD
index 04e8012..6fc3aea 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -129,7 +129,7 @@
":create_embedded_tools.sh",
"//tools:embedded_tools_srcs",
"//third_party:gpl-srcs",
- "//third_party/java/jarjar:srcs",
+ "//third_party/java/jarjar:embedded_tools_srcs",
"//third_party/java/jdk/langtools:test-srcs",
"//third_party/py/concurrent:srcs",
"//third_party/py/gflags:srcs",
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 1714f62..0620be9 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
@@ -105,11 +105,11 @@
"if [[ $$(uname -a) =~ MSYS ]] || [[ $$(uname -a) =~ CYGWIN ]] || [[ $$(uname -a) =~ freebsd ]]; then",
" cp \"$(location :JacocoCoverage_deploy.jar)\" \"$@\";",
"else",
- " \"$(JAVA)\" -jar \"$(location //third_party/java/jarjar:jarjar_command_deploy.jar)\" --rules \"$(location :JacocoCoverage.jarjar)\" --output \"$@\" \"$(location :JacocoCoverage_deploy.jar)\"",
+ " \"$(JAVA)\" -jar \"$(location //third_party/java/jarjar:jarjar_bin_deploy.jar)\" --rules \"$(location :JacocoCoverage.jarjar)\" --output \"$@\" \"$(location :JacocoCoverage_deploy.jar)\"",
"fi",
]),
tools = [
- "//third_party/java/jarjar:jarjar_command_deploy.jar",
+ "//third_party/java/jarjar:jarjar_bin_deploy.jar",
"//tools/defaults:jdk",
],
)
