Add r8mappings for tests to third party dependencies
Change-Id: Iea18ccc31b24ed4851a8fe30b18ecb3c1efcf68f
diff --git a/.gitignore b/.gitignore
index 33bdcfe..b42d835 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,6 +135,8 @@
third_party/openjdk/jdk-11-test.tar.gz
third_party/r8
third_party/r8.tar.gz
+third_party/r8mappings
+third_party/r8mappings.tar.gz
third_party/sample_libraries
third_party/sample_libraries.tar.gz
src/test/jack/ub-jack
diff --git a/build.gradle b/build.gradle
index ac517a1..cf6ea51 100644
--- a/build.gradle
+++ b/build.gradle
@@ -317,6 +317,7 @@
"proguard/proguard5.2.1",
"proguard/proguard6.0.1",
"r8",
+ "r8mappings"
],
// All dex-vms have a fixed OS of Linux, as they are only supported on Linux, and will be run in a Docker
// container on other platforms where supported.
@@ -476,22 +477,6 @@
}
}
-task downloadMappingFilesForRetraceTests {
- def hashes = [
- "82710798b61fd70910d76d23a71e436356becb66",
- "dab96bbe5948133f0ae6e0a88fc133464421cf47"
- ]
- outputs.files hashes.each { hash -> file("${buildDir}/retrace/${hash}-r8lib.jar.map") }
- hashes.each { hash ->
- def outputDir = new File("${buildDir}/retrace")
- outputDir.mkdirs()
- def output = new File("${buildDir}/retrace/${hash}-r8lib.jar.map")
- output.createNewFile()
- new URL("http://storage.googleapis.com/r8-releases/raw/master/${hash}/r8lib.jar.map")
- .withInputStream { i -> output.withOutputStream { it << i } }
- }
-}
-
allprojects {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
@@ -1961,7 +1946,6 @@
"Art only runs on Linux and tests requiring Art will be skipped")
}
dependsOn downloadDeps
- dependsOn downloadMappingFilesForRetraceTests
dependsOn buildExamples
dependsOn buildExamplesKotlin
dependsOn buildKotlinR8TestResources
diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index b124757..efe42a1 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -139,7 +139,7 @@
private static final String RETRACE6_0_1 = "third_party/proguard/proguard6.0.1/bin/retrace";
private static final String RETRACE = RETRACE6_0_1;
- public static final Path RETRACE_MAPS_DIR = Paths.get(BUILD_DIR, "retrace");
+ public static final Path RETRACE_MAPS_DIR = Paths.get(THIRD_PARTY_DIR, "r8mappings");
public static final long BOT_MAX_HEAP_SIZE = 7908360192L;
diff --git a/third_party/r8mappings.tar.gz.sha1 b/third_party/r8mappings.tar.gz.sha1
new file mode 100644
index 0000000..a00ac52
--- /dev/null
+++ b/third_party/r8mappings.tar.gz.sha1
@@ -0,0 +1 @@
+baaf8e15c9f54677c30caf070a22319ccd46539c
\ No newline at end of file
