aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar John Cater <jcater@google.com>2017-01-05 20:48:17 +0000
committerGravatar John Cater <jcater@google.com>2017-01-05 21:11:08 +0000
commitca61f2c46f1f9823df8ff45bb5ce398a45c6ba10 (patch)
treefef81ab0ea679135ca8a9faced2db068b6cd8066 /src
parentc9d1abd32d0cbc76d4dcbb958896cc2b2d690ef5 (diff)
Revert "Jarjar the third-party dependencies of the Jacoco test runner."
JarJar is not working on Windows, see #2343. This reverts commit 823091f7516abf7d854021edc765daf1467f1647. -- Change-Id: I141d40f09e2f0c7c256915404058512d309386b4 Reviewed-on: https://cr.bazel.build/8094 PiperOrigin-RevId: 143697534 MOS_MIGRATED_REVID=143697534
Diffstat (limited to 'src')
-rw-r--r--src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD13
-rw-r--r--src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverage.jarjar2
2 files changed, 1 insertions, 14 deletions
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 354969042e..4d0ff8278e 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
@@ -22,7 +22,7 @@ filegroup(
filegroup(
name = "embedded_tools",
srcs = [
- "JacocoCoverage_jarjar_deploy.jar",
+ "JacocoCoverage_deploy.jar",
],
)
@@ -68,14 +68,3 @@ java_library(
"//third_party:apache_commons_lang",
],
)
-
-genrule(
- name = "Jacoco_jarjar",
- srcs = [
- ":JacocoCoverage_deploy.jar",
- ":JacocoCoverage.jarjar",
- ],
- outs = ["JacocoCoverage_jarjar_deploy.jar"],
- cmd = "$(location //third_party/java/jarjar:jarjar_bin) process $(location :JacocoCoverage.jarjar) $(location :JacocoCoverage_deploy.jar) $@",
- tools = ["//third_party/java/jarjar:jarjar_bin"],
-)
diff --git a/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverage.jarjar b/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverage.jarjar
deleted file mode 100644
index 56190d874c..0000000000
--- a/src/java_tools/junitrunner/java/com/google/testing/coverage/JacocoCoverage.jarjar
+++ /dev/null
@@ -1,2 +0,0 @@
-rule org.apache.commons.** com.google.testing.coverage.jarjar.@0
-rule org.objectweb.asm.** com.google.testing.coverage.jarjar.@0