Fix missing java or incorrect android runtime libraries in R8/CF tests.
Change-Id: Ia66c966ddec82f05deff3658b51368b8cefe9333
diff --git a/src/test/java/com/android/tools/r8/CfFrontendExamplesTest.java b/src/test/java/com/android/tools/r8/CfFrontendExamplesTest.java
index 4f749b5..70e8445 100644
--- a/src/test/java/com/android/tools/r8/CfFrontendExamplesTest.java
+++ b/src/test/java/com/android/tools/r8/CfFrontendExamplesTest.java
@@ -303,6 +303,7 @@
R8Command command =
R8Command.builder()
.addProgramFiles(inputJar)
+ .addLibraryFiles(ToolHelper.getJava8RuntimeJar())
.setMode(CompilationMode.DEBUG)
.setOutput(outputJar, OutputMode.ClassFile)
.build();
diff --git a/src/test/java/com/android/tools/r8/R8CFExamplesTests.java b/src/test/java/com/android/tools/r8/R8CFExamplesTests.java
index 377bfc0..2dbfb37 100644
--- a/src/test/java/com/android/tools/r8/R8CFExamplesTests.java
+++ b/src/test/java/com/android/tools/r8/R8CFExamplesTests.java
@@ -101,7 +101,7 @@
Path outputJar = temp.getRoot().toPath().resolve(outputName);
ToolHelper.runR8(
R8Command.builder()
- .addLibraryFiles(Paths.get(ToolHelper.JAVA_8_RUNTIME))
+ .addLibraryFiles(ToolHelper.getJava8RuntimeJar())
.setMode(mode)
.addProgramFiles(inputJar)
.setOutput(outputJar, OutputMode.ClassFile)
diff --git a/src/test/java/com/android/tools/r8/R8CFRunExamplesJava9Test.java b/src/test/java/com/android/tools/r8/R8CFRunExamplesJava9Test.java
index c773989..c4a0f48 100644
--- a/src/test/java/com/android/tools/r8/R8CFRunExamplesJava9Test.java
+++ b/src/test/java/com/android/tools/r8/R8CFRunExamplesJava9Test.java
@@ -8,7 +8,6 @@
import static org.junit.Assert.assertEquals;
import com.android.tools.r8.ToolHelper.ProcessResult;
-import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.dexinspector.DexInspector;
import com.google.common.collect.ImmutableList;
import java.io.IOException;
@@ -37,7 +36,7 @@
for (UnaryOperator<R8Command.Builder> transformation : builderTransformations) {
builder = transformation.apply(builder);
}
- builder.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.P));
+ builder.addLibraryFiles(ToolHelper.getJava8RuntimeJar());
R8Command command =
builder.addProgramFiles(inputFile).setOutput(out, OutputMode.ClassFile).build();
ToolHelper.runR8(command, this::combinedOptionConsumer);
diff --git a/src/test/java/com/android/tools/r8/R8RunExamplesCommon.java b/src/test/java/com/android/tools/r8/R8RunExamplesCommon.java
index 3d3b4e7..008c6b9 100644
--- a/src/test/java/com/android/tools/r8/R8RunExamplesCommon.java
+++ b/src/test/java/com/android/tools/r8/R8RunExamplesCommon.java
@@ -161,11 +161,15 @@
break;
}
case R8: {
- R8Command command =
- addInputFile(R8Command.builder())
- .setOutput(getOutputFile(), outputMode)
- .setMode(mode)
- .build();
+ R8Command command =
+ addInputFile(R8Command.builder())
+ .addLibraryFiles(
+ output == Output.CF
+ ? ToolHelper.getJava8RuntimeJar()
+ : ToolHelper.getDefaultAndroidJar())
+ .setOutput(getOutputFile(), outputMode)
+ .setMode(mode)
+ .build();
ExceptionUtils.withR8CompilationHandler(
command.getReporter(),
() ->
diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index 2767df7..2499b5f 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -533,6 +533,10 @@
return getArtDir(version) + "/" + binary;
}
+ public static Path getJava8RuntimeJar() {
+ return Paths.get(JAVA_8_RUNTIME);
+ }
+
public static Path getDefaultAndroidJar() {
return getAndroidJar(AndroidApiLevel.getDefault());
}
diff --git a/src/test/java/com/android/tools/r8/cf/BootstrapTest.java b/src/test/java/com/android/tools/r8/cf/BootstrapTest.java
index 7fdad0d..90b64900 100644
--- a/src/test/java/com/android/tools/r8/cf/BootstrapTest.java
+++ b/src/test/java/com/android/tools/r8/cf/BootstrapTest.java
@@ -102,7 +102,7 @@
ToolHelper.runR8(
R8Command.builder()
.setMode(mode)
- .addLibraryFiles(Paths.get(ToolHelper.JAVA_8_RUNTIME))
+ .addLibraryFiles(ToolHelper.getJava8RuntimeJar())
.setProgramConsumer(new ClassFileConsumer.ArchiveConsumer(outputJar, true))
.addProgramFiles(inputJar)
.addProguardConfigurationFiles(pgConfigFile)
diff --git a/src/test/java/com/android/tools/r8/cf/IdenticalCatchHandlerTest.java b/src/test/java/com/android/tools/r8/cf/IdenticalCatchHandlerTest.java
index d285dc6..063b676 100644
--- a/src/test/java/com/android/tools/r8/cf/IdenticalCatchHandlerTest.java
+++ b/src/test/java/com/android/tools/r8/cf/IdenticalCatchHandlerTest.java
@@ -23,7 +23,6 @@
import com.google.common.collect.Sets;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSet;
-import java.nio.file.Paths;
import java.util.Set;
import org.junit.Test;
@@ -52,7 +51,7 @@
AndroidApp inputApp =
AndroidApp.builder()
.addClassProgramData(inputBytes, Origin.unknown())
- .addLibraryFiles(Paths.get(ToolHelper.JAVA_8_RUNTIME))
+ .addLibraryFiles(ToolHelper.getJava8RuntimeJar())
.build();
assertEquals(2, countCatchHandlers(inputApp));
AndroidApp outputDexApp = ToolHelper.runR8(inputApp);
diff --git a/src/test/java/com/android/tools/r8/cf/LambdaTestRunner.java b/src/test/java/com/android/tools/r8/cf/LambdaTestRunner.java
index e1d110c..d08e8c6 100644
--- a/src/test/java/com/android/tools/r8/cf/LambdaTestRunner.java
+++ b/src/test/java/com/android/tools/r8/cf/LambdaTestRunner.java
@@ -20,7 +20,6 @@
import com.android.tools.r8.utils.AndroidAppConsumers;
import com.android.tools.r8.utils.dexinspector.DexInspector;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.Collections;
import java.util.List;
import org.junit.Assert;
@@ -52,7 +51,7 @@
R8.run(
R8Command.builder()
.setMode(CompilationMode.DEBUG)
- .addLibraryFiles(Paths.get(ToolHelper.JAVA_8_RUNTIME))
+ .addLibraryFiles(ToolHelper.getJava8RuntimeJar())
.setProgramConsumer(appBuilder.wrapClassFileConsumer(new ArchiveConsumer(outPath)))
.addClassProgramData(inputClass, Origin.unknown())
.build());
diff --git a/src/test/java/com/android/tools/r8/cf/NestedExceptionTestRunner.java b/src/test/java/com/android/tools/r8/cf/NestedExceptionTestRunner.java
index c0a5455..a60eda9 100644
--- a/src/test/java/com/android/tools/r8/cf/NestedExceptionTestRunner.java
+++ b/src/test/java/com/android/tools/r8/cf/NestedExceptionTestRunner.java
@@ -29,7 +29,7 @@
R8Command.builder()
.setMode(CompilationMode.DEBUG)
.addClassProgramData(ToolHelper.getClassAsBytes(CLASS), Origin.unknown())
- .addLibraryFiles(ToolHelper.getAndroidJar(ToolHelper.getMinApiLevelForDexVm()))
+ .addLibraryFiles(ToolHelper.getJava8RuntimeJar())
.setProgramConsumer(sink.wrapClassFileConsumer(null))
.build());
Path out = temp.newFolder().toPath().resolve("test.jar");
diff --git a/src/test/java/com/android/tools/r8/debug/ArrayDimensionGreaterThanSevenTestRunner.java b/src/test/java/com/android/tools/r8/debug/ArrayDimensionGreaterThanSevenTestRunner.java
index 7866e1b..bcc70c6 100644
--- a/src/test/java/com/android/tools/r8/debug/ArrayDimensionGreaterThanSevenTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debug/ArrayDimensionGreaterThanSevenTestRunner.java
@@ -36,6 +36,7 @@
R8Command.builder()
.addClassProgramData(ToolHelper.getClassAsBytes(CLASS), Origin.unknown())
.setMode(CompilationMode.DEBUG)
+ .addLibraryFiles(ToolHelper.getJava8RuntimeJar())
.setOutput(cfOut, OutputMode.ClassFile)
.build(),
optionsConsumer);
diff --git a/src/test/java/com/android/tools/r8/debug/DebugInfoWhenInliningTest.java b/src/test/java/com/android/tools/r8/debug/DebugInfoWhenInliningTest.java
index f010357..29b0e17 100644
--- a/src/test/java/com/android/tools/r8/debug/DebugInfoWhenInliningTest.java
+++ b/src/test/java/com/android/tools/r8/debug/DebugInfoWhenInliningTest.java
@@ -55,7 +55,9 @@
config = new DexDebugTestConfig(outjar);
} else {
assert (runtimeKind == RuntimeKind.CF);
- builder.setOutput(outjar, OutputMode.ClassFile);
+ builder
+ .setOutput(outjar, OutputMode.ClassFile)
+ .addLibraryFiles(ToolHelper.getJava8RuntimeJar());
config = new CfDebugTestConfig(outjar);
}
diff --git a/src/test/java/com/android/tools/r8/debug/ExamplesDebugTest.java b/src/test/java/com/android/tools/r8/debug/ExamplesDebugTest.java
index 6de20c6..6dccf0b 100644
--- a/src/test/java/com/android/tools/r8/debug/ExamplesDebugTest.java
+++ b/src/test/java/com/android/tools/r8/debug/ExamplesDebugTest.java
@@ -51,6 +51,7 @@
ToolHelper.runR8(
R8Command.builder()
.addProgramFiles(input)
+ .addLibraryFiles(ToolHelper.getJava8RuntimeJar())
.setMode(CompilationMode.DEBUG)
.setOutput(output, OutputMode.ClassFile)
.build(),
diff --git a/src/test/java/com/android/tools/r8/debug/IincDebugTestRunner.java b/src/test/java/com/android/tools/r8/debug/IincDebugTestRunner.java
index bc390b9..a275e6b 100644
--- a/src/test/java/com/android/tools/r8/debug/IincDebugTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debug/IincDebugTestRunner.java
@@ -17,7 +17,6 @@
import com.android.tools.r8.ToolHelper.ProcessResult;
import com.android.tools.r8.debug.DebugTestBase.JUnit3Wrapper.DebuggeeState;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.stream.Stream;
import org.junit.Assume;
import org.junit.Test;
@@ -115,7 +114,7 @@
.setProgramConsumer(consumer)
.addProgramFiles(inputJar);
if ((consumer instanceof ClassFileConsumer)) {
- builder.addLibraryFiles(Paths.get(ToolHelper.JAVA_8_RUNTIME));
+ builder.addLibraryFiles(ToolHelper.getJava8RuntimeJar());
} else {
builder.addLibraryFiles(ToolHelper.getAndroidJar(ToolHelper.getMinApiLevelForDexVm()));
}
diff --git a/src/test/java/com/android/tools/r8/debug/LineNumberOptimizationTest.java b/src/test/java/com/android/tools/r8/debug/LineNumberOptimizationTest.java
index 6e1c05f..5cbe03d 100644
--- a/src/test/java/com/android/tools/r8/debug/LineNumberOptimizationTest.java
+++ b/src/test/java/com/android/tools/r8/debug/LineNumberOptimizationTest.java
@@ -60,7 +60,9 @@
DebugTestConfig config = null;
if (runtimeKind == RuntimeKind.CF) {
- builder.setOutput(outjar, OutputMode.ClassFile);
+ builder
+ .setOutput(outjar, OutputMode.ClassFile)
+ .addLibraryFiles(ToolHelper.getJava8RuntimeJar());
config = new CfDebugTestConfig(outjar);
} else {
assert (runtimeKind == RuntimeKind.DEX);
diff --git a/src/test/java/com/android/tools/r8/debug/MinificationTest.java b/src/test/java/com/android/tools/r8/debug/MinificationTest.java
index 1bb357f..ca2910e 100644
--- a/src/test/java/com/android/tools/r8/debug/MinificationTest.java
+++ b/src/test/java/com/android/tools/r8/debug/MinificationTest.java
@@ -80,7 +80,6 @@
proguardConfigurations = builder.build();
}
- AndroidApiLevel minSdk = ToolHelper.getMinApiLevelForDexVm();
Path outputPath = temp.getRoot().toPath().resolve("classes.zip");
Path proguardMap = writeProguardMap ? temp.getRoot().toPath().resolve("proguard.map") : null;
OutputMode outputMode =
@@ -89,10 +88,12 @@
R8Command.builder()
.addProgramFiles(DEBUGGEE_JAR)
.setOutput(outputPath, outputMode)
- .setMode(CompilationMode.DEBUG)
- .addLibraryFiles(ToolHelper.getAndroidJar(minSdk));
- if (runtimeKind != RuntimeKind.CF) {
- builder.setMinApiLevel(minSdk.getLevel());
+ .setMode(CompilationMode.DEBUG);
+ if (runtimeKind == RuntimeKind.DEX) {
+ AndroidApiLevel minSdk = ToolHelper.getMinApiLevelForDexVm();
+ builder.setMinApiLevel(minSdk.getLevel()).addLibraryFiles(ToolHelper.getAndroidJar(minSdk));
+ } else if (runtimeKind == RuntimeKind.CF) {
+ builder.addLibraryFiles(ToolHelper.getJava8RuntimeJar());
}
if (proguardMap != null) {
builder.setProguardMapOutputPath(proguardMap);
diff --git a/src/test/java/com/android/tools/r8/debug/NopDebugTestRunner.java b/src/test/java/com/android/tools/r8/debug/NopDebugTestRunner.java
index 3ea4017..813a873 100644
--- a/src/test/java/com/android/tools/r8/debug/NopDebugTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debug/NopDebugTestRunner.java
@@ -11,7 +11,6 @@
import com.android.tools.r8.debug.DebugTestBase.JUnit3Wrapper.DebuggeeState;
import com.android.tools.r8.utils.DescriptorUtils;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.stream.Stream;
import org.junit.Assume;
import org.junit.Test;
@@ -47,7 +46,7 @@
Path outputJar = temp.getRoot().toPath().resolve(outputName);
ToolHelper.runR8(
R8Command.builder()
- .addLibraryFiles(Paths.get(ToolHelper.JAVA_8_RUNTIME))
+ .addLibraryFiles(ToolHelper.getJava8RuntimeJar())
.setMode(CompilationMode.DEBUG)
.addProgramFiles(inputJar)
.setOutput(outputJar, OutputMode.ClassFile)
diff --git a/src/test/java/com/android/tools/r8/debug/R8CfDebugTestResourcesConfig.java b/src/test/java/com/android/tools/r8/debug/R8CfDebugTestResourcesConfig.java
index e4a88f0..67b7c1a 100644
--- a/src/test/java/com/android/tools/r8/debug/R8CfDebugTestResourcesConfig.java
+++ b/src/test/java/com/android/tools/r8/debug/R8CfDebugTestResourcesConfig.java
@@ -8,7 +8,6 @@
import com.android.tools.r8.R8;
import com.android.tools.r8.R8Command;
import com.android.tools.r8.ToolHelper;
-import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.AndroidApp;
import com.android.tools.r8.utils.AndroidAppConsumers;
import java.nio.file.Path;
@@ -21,14 +20,13 @@
private static synchronized AndroidApp getCompiledResources() throws Throwable {
if (compiledResources == null) {
- AndroidApiLevel minApi = ToolHelper.getMinApiLevelForDexVm();
AndroidAppConsumers sink = new AndroidAppConsumers();
R8.run(
R8Command.builder()
.setMode(CompilationMode.DEBUG)
.addProgramFiles(DebugTestBase.DEBUGGEE_JAR)
.setProgramConsumer(sink.wrapClassFileConsumer(null))
- .addLibraryFiles(ToolHelper.getAndroidJar(minApi))
+ .addLibraryFiles(ToolHelper.getJava8RuntimeJar())
.build());
compiledResources = sink.build();
}
diff --git a/src/test/java/com/android/tools/r8/debuginfo/KotlinDebugInfoTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/KotlinDebugInfoTestRunner.java
index 103c07f..80279d5 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/KotlinDebugInfoTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/KotlinDebugInfoTestRunner.java
@@ -15,7 +15,6 @@
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.ToolHelper.ProcessResult;
import java.nio.file.Path;
-import java.nio.file.Paths;
import org.junit.Test;
public class KotlinDebugInfoTestRunner extends TestBase {
@@ -74,7 +73,7 @@
.setProgramConsumer(consumer)
.addProgramFiles(inputJar);
if ((consumer instanceof ClassFileConsumer)) {
- builder.addLibraryFiles(Paths.get(ToolHelper.JAVA_8_RUNTIME));
+ builder.addLibraryFiles(ToolHelper.getJava8RuntimeJar());
} else {
builder.addLibraryFiles(ToolHelper.getAndroidJar(ToolHelper.getMinApiLevelForDexVm()));
}
diff --git a/src/test/java/com/android/tools/r8/ir/PhiDefinitionsTestRunner.java b/src/test/java/com/android/tools/r8/ir/PhiDefinitionsTestRunner.java
index 4f2bdeb..ba43a10 100644
--- a/src/test/java/com/android/tools/r8/ir/PhiDefinitionsTestRunner.java
+++ b/src/test/java/com/android/tools/r8/ir/PhiDefinitionsTestRunner.java
@@ -17,7 +17,6 @@
import com.android.tools.r8.utils.DescriptorUtils;
import java.io.IOException;
import java.nio.file.Path;
-import java.nio.file.Paths;
import org.junit.Test;
public class PhiDefinitionsTestRunner extends TestBase {
@@ -111,7 +110,7 @@
.setProgramConsumer(consumer)
.addProgramFiles(inputJar);
if (consumer instanceof ClassFileConsumer) {
- builder.addLibraryFiles(Paths.get(ToolHelper.JAVA_8_RUNTIME));
+ builder.addLibraryFiles(ToolHelper.getJava8RuntimeJar());
} else {
builder.addLibraryFiles(ToolHelper.getAndroidJar(ToolHelper.getMinApiLevelForDexVm()));
}
diff --git a/src/test/java/com/android/tools/r8/jasmin/JumpSubroutineTests.java b/src/test/java/com/android/tools/r8/jasmin/JumpSubroutineTests.java
index ec18fac..fd68772 100644
--- a/src/test/java/com/android/tools/r8/jasmin/JumpSubroutineTests.java
+++ b/src/test/java/com/android/tools/r8/jasmin/JumpSubroutineTests.java
@@ -16,7 +16,6 @@
import com.android.tools.r8.utils.AndroidApp;
import com.google.common.collect.ImmutableList;
import java.nio.file.Path;
-import java.nio.file.Paths;
import org.junit.Test;
public class JumpSubroutineTests extends JasminTestBase {
@@ -40,7 +39,7 @@
R8Command.builder()
.addProgramFiles(inputJar)
.setOutput(outputJar, OutputMode.ClassFile)
- .addLibraryFiles(Paths.get(ToolHelper.JAVA_8_RUNTIME))
+ .addLibraryFiles(ToolHelper.getJava8RuntimeJar())
.build(),
options -> options.enableCfFrontend = true);
ProcessResult processResult = ToolHelper.runJava(outputJar, main);
diff --git a/src/test/java/com/android/tools/r8/naming/ApplyMappingTest.java b/src/test/java/com/android/tools/r8/naming/ApplyMappingTest.java
index 39d7f0b..327f02e 100644
--- a/src/test/java/com/android/tools/r8/naming/ApplyMappingTest.java
+++ b/src/test/java/com/android/tools/r8/naming/ApplyMappingTest.java
@@ -300,7 +300,11 @@
private R8Command.Builder getCommandForInstrumentation(
Path out, Path flag, Path mainApp, Path instrApp) throws IOException {
return R8Command.builder()
- .addLibraryFiles(ToolHelper.getDefaultAndroidJar(), mainApp)
+ .addLibraryFiles(
+ backend == Backend.DEX
+ ? ToolHelper.getDefaultAndroidJar()
+ : ToolHelper.getJava8RuntimeJar(),
+ mainApp)
.addProgramFiles(instrApp)
.setOutput(out, backend == Backend.DEX ? OutputMode.DexIndexed : OutputMode.ClassFile)
.addProguardConfigurationFiles(flag);
@@ -309,7 +313,10 @@
private R8Command.Builder getCommandForApps(Path out, Path flag, Path... jars)
throws IOException {
return R8Command.builder()
- .addLibraryFiles(ToolHelper.getDefaultAndroidJar())
+ .addLibraryFiles(
+ backend == Backend.DEX
+ ? ToolHelper.getDefaultAndroidJar()
+ : ToolHelper.getJava8RuntimeJar())
.addProgramFiles(jars)
.setOutput(out, backend == Backend.DEX ? OutputMode.DexIndexed : OutputMode.ClassFile)
.addProguardConfigurationFiles(flag);
diff --git a/src/test/java/com/android/tools/r8/naming/IdentifierMinifierTest.java b/src/test/java/com/android/tools/r8/naming/IdentifierMinifierTest.java
index 7ab6cf1..ee1568b 100644
--- a/src/test/java/com/android/tools/r8/naming/IdentifierMinifierTest.java
+++ b/src/test/java/com/android/tools/r8/naming/IdentifierMinifierTest.java
@@ -81,7 +81,7 @@
if (backend == Backend.DEX) {
builder.addLibraryFiles(ToolHelper.getDefaultAndroidJar());
} else if (backend == Backend.CF) {
- builder.addLibraryFiles(Paths.get(ToolHelper.JAVA_8_RUNTIME));
+ builder.addLibraryFiles(ToolHelper.getJava8RuntimeJar());
}
ToolHelper.getAppBuilder(builder).addProgramFiles(Paths.get(appFileName));
processedApp = ToolHelper.runR8(builder.build(), o -> o.debug = false);
diff --git a/src/test/java/com/android/tools/r8/naming/LambdaRenamingTestRunner.java b/src/test/java/com/android/tools/r8/naming/LambdaRenamingTestRunner.java
index c7c74e9..02bca3a 100644
--- a/src/test/java/com/android/tools/r8/naming/LambdaRenamingTestRunner.java
+++ b/src/test/java/com/android/tools/r8/naming/LambdaRenamingTestRunner.java
@@ -20,7 +20,6 @@
import com.android.tools.r8.utils.FileUtils;
import java.io.IOException;
import java.nio.file.Path;
-import java.nio.file.Paths;
import org.junit.Before;
import org.junit.Test;
@@ -129,7 +128,7 @@
Path outPg = temp.getRoot().toPath().resolve(outName);
ProcessResult proguardResult =
ToolHelper.runProguard6Raw(
- inputJar, outPg, Paths.get(ToolHelper.JAVA_8_RUNTIME), pgConfig, null);
+ inputJar, outPg, ToolHelper.getJava8RuntimeJar(), pgConfig, null);
System.out.println(proguardResult.stdout);
if (proguardResult.exitCode != 0) {
System.out.println(proguardResult.stderr);
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java b/src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java
index ca62dee..bbb90ef 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java
@@ -166,6 +166,7 @@
R8Command command =
ToolHelper.prepareR8CommandBuilder(readClasses(ClassWithAssertions.class))
.setMode(CompilationMode.DEBUG)
+ .addLibraryFiles(ToolHelper.getJava8RuntimeJar())
.setOutput(outputJar, OutputMode.ClassFile)
.build();
ToolHelper.runR8(command, consumer);
diff --git a/src/test/java/com/android/tools/r8/shaking/InstantiatedLambdasTestRunner.java b/src/test/java/com/android/tools/r8/shaking/InstantiatedLambdasTestRunner.java
index 474af4d..12ef651 100644
--- a/src/test/java/com/android/tools/r8/shaking/InstantiatedLambdasTestRunner.java
+++ b/src/test/java/com/android/tools/r8/shaking/InstantiatedLambdasTestRunner.java
@@ -19,7 +19,6 @@
import com.android.tools.r8.utils.FileUtils;
import java.io.IOException;
import java.nio.file.Path;
-import java.nio.file.Paths;
import org.junit.Before;
import org.junit.Test;
@@ -122,7 +121,7 @@
Path outPg = temp.getRoot().toPath().resolve(outName);
ProcessResult proguardResult =
ToolHelper.runProguard6Raw(
- inputJar, outPg, Paths.get(ToolHelper.JAVA_8_RUNTIME), pgConfig, null);
+ inputJar, outPg, ToolHelper.getJava8RuntimeJar(), pgConfig, null);
System.out.println(proguardResult.stdout);
if (proguardResult.exitCode != 0) {
System.out.println(proguardResult.stderr);
diff --git a/src/test/java/com/android/tools/r8/shaking/TreeShakingTest.java b/src/test/java/com/android/tools/r8/shaking/TreeShakingTest.java
index 24d4ba5..a975d2c 100644
--- a/src/test/java/com/android/tools/r8/shaking/TreeShakingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/TreeShakingTest.java
@@ -193,7 +193,7 @@
if (backend == Backend.CF) {
jarLibraries =
ImmutableList.of(
- Paths.get(ToolHelper.JAVA_8_RUNTIME),
+ ToolHelper.getJava8RuntimeJar(),
Paths.get(ToolHelper.EXAMPLES_BUILD_DIR + "shakinglib.jar"));
} else {
jarLibraries =
diff --git a/src/test/java/com/android/tools/r8/shaking/examples/InliningClassVersionTest.java b/src/test/java/com/android/tools/r8/shaking/examples/InliningClassVersionTest.java
index 7fcb318..ba0d468 100644
--- a/src/test/java/com/android/tools/r8/shaking/examples/InliningClassVersionTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/examples/InliningClassVersionTest.java
@@ -17,7 +17,6 @@
import com.android.tools.r8.utils.DescriptorUtils;
import com.google.common.io.ByteStreams;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.Collections;
import java.util.List;
import org.junit.Test;
@@ -147,7 +146,7 @@
ToolHelper.runR8(
R8Command.builder()
.addProgramFiles(inputJar)
- .addLibraryFiles(Paths.get(ToolHelper.JAVA_8_RUNTIME))
+ .addLibraryFiles(ToolHelper.getJava8RuntimeJar())
.addProguardConfiguration(keepRule, Origin.unknown())
.setOutput(outputJar, OutputMode.ClassFile)
.build());
