diff options
| author |  cushon <cushon@google.com> | 2018-04-16 09:34:49 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-16 09:36:58 -0700 |
| commit | eec549fafc25d9c713d61bab228b086c0b18346b (patch) | |
| tree | 7ca9dfc212031d6b45b9da347202f994cc26e719 /src | |
| parent | a5876cda41f36dc7e3610267e4f1df3b8d84b216 (diff) | |
Migrate to the new version of jarjar
PiperOrigin-RevId: 193052121
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
@@ -122,7 +122,7 @@ py_binary( "//tools:embedded_tools_srcs", "//third_party:gpl-srcs", "//third_party/java/j2objc:embedded_tools_srcs", - "//third_party/java/jarjar:embedded_tools_srcs", + "//third_party/jarjar:embedded_tools_srcs", "//third_party/java/jdk/langtools:test-srcs", "//third_party/java/proguard:embedded_tools", "//third_party/py/concurrent: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 88948371ab..031793165f 100644 --- a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD +++ b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD @@ -65,7 +65,7 @@ genrule( outs = ["JacocoCoverage_jarjar_deploy.jar"], cmd = "\n".join([ "JARJAR=\"$$(mktemp -t bazel.XXXXXXXX)\"", - "\"$(JAVA)\" -jar \"$(location //third_party/java/jarjar:jarjar_bin_deploy.jar)\" --rules \"$(location :JacocoCoverage.jarjar)\" --output \"$${JARJAR}\" \"$(location :JacocoCoverage_deploy.jar)\"", + "\"$(JAVA)\" -jar \"$(location //third_party/jarjar:jarjar_bin_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}\"", ]), @@ -73,7 +73,7 @@ genrule( toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"], tools = [ "//src/java_tools/singlejar:SingleJar_deploy.jar", - "//third_party/java/jarjar:jarjar_bin_deploy.jar", + "//third_party/jarjar:jarjar_bin_deploy.jar", "//tools/defaults:jdk", ], ) |