diff options
| author |  lberki <lberki@google.com> | 2017-04-20 12:38:16 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-04-20 13:40:58 +0200 |
| commit | de48d7d8cf0fe3d87e348e74e10506d160495428 (patch) | |
| tree | 45fe8afd2d9d67dc91e01c12893ed1410d897124 /src | |
| parent | 28c9617d53bf58dcba9572bcfdc165c62421d983 (diff) | |
Embed a prebuilt jarjar into Bazel so that Android builds work again.
Fixes #2848.
RELNOTES: None.
PiperOrigin-RevId: 153692641
Diffstat (limited to 'src')
| -rw-r--r-- | src/BUILD | 2 | ||||
| -rw-r--r-- | src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -129,7 +129,7 @@ filegroup( ":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 1714f62434..0620be9d32 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 @@ genrule( "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", ], ) |