commit 4b25595f8d7f662e085db564fe100240f1f3b367
author Christoffer Quist Adamsen <christofferqa@google.com> Mon May 25 08:03:58 2020 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon May 25 08:03:58 2020 +0200
tree 5046384ca31934b6a9503e391eafa571ce32024b
parent 7501766b6e77ffa03589860a0fb12c6fd1cd4a24

Fix missing classes in tests

Change-Id: Ife79223281058cc795139aa87071d0e79936f50d

src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/Java11D8CompilationTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/Java11D8CompilationTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/Java11D8CompilationTest.java
index 6fdfe97..03e7f70 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/Java11D8CompilationTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/Java11D8CompilationTest.java
@@ -40,6 +40,7 @@
   public void testR8CompiledWithD8() throws Exception {
     testForD8()
         .addProgramFiles(ToolHelper.R8_WITH_RELOCATED_DEPS_11_JAR)
+        .addLibraryFiles(ToolHelper.getJava8RuntimeJar())
         .compile()
         .inspect(Java11D8CompilationTest::assertNoNests);
   }

src/test/java/com/android/tools/r8/internal/D8Framework14082017VerificationTest.java

diff --git a/src/test/java/com/android/tools/r8/internal/D8Framework14082017VerificationTest.java b/src/test/java/com/android/tools/r8/internal/D8Framework14082017VerificationTest.java
index 6dbb356..c8ea9ec 100644
--- a/src/test/java/com/android/tools/r8/internal/D8Framework14082017VerificationTest.java
+++ b/src/test/java/com/android/tools/r8/internal/D8Framework14082017VerificationTest.java
@@ -5,6 +5,7 @@
 
 import com.android.tools.r8.CompilationMode;
 import com.android.tools.r8.D8Command;
+import com.android.tools.r8.ToolHelper;
 import com.android.tools.r8.ToolHelper.DexVm.Version;
 import com.android.tools.r8.VmTestRunner;
 import com.android.tools.r8.VmTestRunner.IgnoreIfVmOlderThan;
@@ -24,6 +25,7 @@
     runAndCheckVerification(
         D8Command.builder()
             .addProgramFiles(Paths.get(JAR))
+            .addLibraryFiles(ToolHelper.getMostRecentAndroidJar())
             .setMode(CompilationMode.DEBUG)
             .setMinApiLevel(MIN_SDK),
         JAR);
@@ -35,6 +37,7 @@
     runAndCheckVerification(
         D8Command.builder()
             .addProgramFiles(Paths.get(JAR))
+            .addLibraryFiles(ToolHelper.getMostRecentAndroidJar())
             .setMode(CompilationMode.RELEASE)
             .setMinApiLevel(MIN_SDK),
         JAR);