commit 41826f2d8073ebdc279536098ad95b44c4dbb6f8
author Mathias Rav <mathiasr@google.com> Tue Apr 24 08:16:17 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 24 08:16:17 2018 +0000
tree 95987143b77ccab13f57e97f83f7e68c444acee2
parent ee10dd69aad54077434ddf4b218462a26007d307
parent b530d5f41e26b71270ad4c16b59869878d203ce6

Merge "Fix LambdaTestRunner using Android jar for Java Runtime test"

src/test/java/com/android/tools/r8/cf/LambdaTestRunner.java

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 21d0292..f47bdc6 100644
--- a/src/test/java/com/android/tools/r8/cf/LambdaTestRunner.java
+++ b/src/test/java/com/android/tools/r8/cf/LambdaTestRunner.java
@@ -19,6 +19,7 @@
 import com.android.tools.r8.utils.AndroidAppConsumers;
 import com.android.tools.r8.utils.DexInspector;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.List;
 import java.util.ListIterator;
@@ -56,7 +57,7 @@
     R8.run(
         R8Command.builder()
             .setMode(CompilationMode.DEBUG)
-            .addLibraryFiles(ToolHelper.getAndroidJar(ToolHelper.getMinApiLevelForDexVm()))
+            .addLibraryFiles(Paths.get(ToolHelper.JAVA_8_RUNTIME))
             .setProgramConsumer(appBuilder.wrapClassFileConsumer(new ArchiveConsumer(outPath)))
             .addClassProgramData(inputClass, Origin.unknown())
             .build());