Update Jacoco
Move existing third_party/jacoco to third_party/jacoco/0.8.2 and
add third_party/jacoco/0.8.6.
README.google for third_party/jacoco/0.8.2 same as third_party/jacoco
before moving to third_party/jacoco/0.8.2.
README.google for third_party/jacoco/0.8.6:
URL: https://github.com/jacoco/jacoco/releases/tag/v0.8.6
Version: 0.8.6
License: Eclipse Public License Version 2.0
License File: doc/license.html
Description:
JaCoCo is a free Java code coverage library distributed under the Eclipse Public License.
Local Modifications:
This only includes lib/jacococli.jar and doc/license.html from the distribution.
Bug: 169866678
Change-Id: Id9c966c171ca7e07c457f8bc648390a6889bc1b0
diff --git a/.gitignore b/.gitignore
index b382c4f..7ba42cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,8 +79,10 @@
third_party/internal/*
third_party/iosched_2019
third_party/iosched_2019.tar.gz
-third_party/jacoco.tar.gz
-third_party/jacoco/*
+third_party/jacoco/0.8.2/*
+third_party/jacoco/0.8.2.tar.gz
+third_party/jacoco/0.8.6/*
+third_party/jacoco/0.8.6.tar.gz
third_party/jasmin
third_party/jasmin.tar.gz
third_party/jctf
diff --git a/build.gradle b/build.gradle
index 54f0898..5153337 100644
--- a/build.gradle
+++ b/build.gradle
@@ -318,7 +318,8 @@
"gradle/gradle",
"google-java-format",
"iosched_2019",
- "jacoco",
+ "jacoco/0.8.2",
+ "jacoco/0.8.6",
"jasmin",
"jctf",
"junit",
diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index 9740354..d150f73 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -159,7 +159,8 @@
private static final String PROGUARD5_2_1 = "third_party/proguard/proguard5.2.1/bin/proguard";
private static final String PROGUARD6_0_1 = "third_party/proguard/proguard6.0.1/bin/proguard";
private static final String PROGUARD = PROGUARD5_2_1;
- public static final String JACOCO_AGENT = "third_party/jacoco/org.jacoco.agent-0.8.2-runtime.jar";
+ public static final String JACOCO_AGENT =
+ "third_party/jacoco/0.8.2/org.jacoco.agent-0.8.2-runtime.jar";
public static final String PROGUARD_SETTINGS_FOR_INTERNAL_APPS = "third_party/proguardsettings/";
private static final String RETRACE6_0_1 = "third_party/proguard/proguard6.0.1/bin/retrace";
diff --git a/third_party/jacoco.tar.gz.sha1 b/third_party/jacoco.tar.gz.sha1
deleted file mode 100644
index 8a0462f..0000000
--- a/third_party/jacoco.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b968df99f88434e2a2a35445ac860ee6a2fa16e3
\ No newline at end of file
diff --git a/third_party/jacoco/0.8.2.tar.gz.sha1 b/third_party/jacoco/0.8.2.tar.gz.sha1
new file mode 100644
index 0000000..f33b98a
--- /dev/null
+++ b/third_party/jacoco/0.8.2.tar.gz.sha1
@@ -0,0 +1 @@
+b8ee2e058a52ff8ca73ae9b6a99426baa2be1626
\ No newline at end of file
diff --git a/third_party/jacoco/0.8.6.tar.gz.sha1 b/third_party/jacoco/0.8.6.tar.gz.sha1
new file mode 100644
index 0000000..47fefc1
--- /dev/null
+++ b/third_party/jacoco/0.8.6.tar.gz.sha1
@@ -0,0 +1 @@
+471ccc4aa6d69a684aa400f08dc6a15e17b4ba25
\ No newline at end of file
