Disable desugaring of JCTF tests and add fixed dependency on Junit
Junit has references to java.lang.management which is not avaiable in
the android runtime, thus desugaring reports a warning. The tests are
fairly old so there should be no need for desugaring.
Change-Id: I7383f44876a62e3986a248ddb34829fbacdbf408
diff --git a/.gitignore b/.gitignore
index 482b1bf..dd39fad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,6 +77,8 @@
!third_party/youtube/*sha1
third_party/jctf
third_party/jctf.tar.gz
+third_party/junit
+third_party/junit.tar.gz
third_party/android_cts_baseline
third_party/android_cts_baseline.tar.gz
third_party/framework
diff --git a/build.gradle b/build.gradle
index dc90666..54a04a0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -272,6 +272,7 @@
"jacoco",
"jasmin",
"jctf",
+ "junit",
"jdwp-tests",
"kotlin",
"openjdk/openjdk-rt-1.8",
diff --git a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
index 13cc8cb..f3c728e 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -111,7 +111,7 @@
private static final String JCTF_TESTS_LIB_PREFIX =
JCTF_TESTS_PREFIX + "/com/google/jctf/test/lib";
private static final String JUNIT_TEST_RUNNER = "org.junit.runner.JUnitCore";
- private static final String JUNIT_JAR = "third_party/gradle/gradle/lib/plugins/junit-4.12.jar";
+ private static final String JUNIT_JAR = "third_party/junit/junit-4.13-beta-2.jar";
private static final String HAMCREST_JAR =
"third_party/gradle/gradle/lib/plugins/hamcrest-core-1.3.jar";
@@ -1683,11 +1683,12 @@
}
case D8: {
assert keepRulesFile == null : "Keep-rules file specified for D8.";
- D8Command.Builder builder =
- D8Command.builder()
- .setMode(mode)
- .addProgramFiles(ListUtils.map(fileNames, Paths::get))
- .setOutput(Paths.get(resultPath), OutputMode.DexIndexed);
+ D8Command.Builder builder =
+ D8Command.builder()
+ .setMode(mode)
+ .addProgramFiles(ListUtils.map(fileNames, Paths::get))
+ .setOutput(Paths.get(resultPath), OutputMode.DexIndexed)
+ .setDisableDesugaring(true);
AndroidApiLevel minSdkVersion = needMinSdkVersion.get(name);
if (minSdkVersion != null) {
builder.setMinApiLevel(minSdkVersion.getLevel());
@@ -1708,6 +1709,7 @@
.setMode(mode)
.setDisableTreeShaking(true)
.setDisableMinification(true)
+ .setDisableDesugaring(true)
.addProguardConfiguration(ImmutableList.of("-keepattributes *"), Origin.unknown())
.setOutput(
Paths.get(resultPath),
diff --git a/third_party/junit.tar.gz.sha1 b/third_party/junit.tar.gz.sha1
new file mode 100644
index 0000000..e6b48ba
--- /dev/null
+++ b/third_party/junit.tar.gz.sha1
@@ -0,0 +1 @@
+375cd265ac5bd99c8d5f412079bbbbebde1b275a
\ No newline at end of file
