commit ddc48d7c4cdc2e9d21f4bfe26265c08a0b43affb
author Clément Béra <clementbera@google.com> Mon Mar 28 08:55:41 2022 +0000
committer Clément Béra <clementbera@google.com> Mon Mar 28 08:55:41 2022 +0000
tree 76d28272df68e817be83051927c008d46f11be74
parent 5f2788fa5ffb5e5fbd2afa5d1e3353283ac50f7d

Fix BackportedMethodListTest

Fix red bots

Change-Id: Idaa0fc06459ac73184a1878866384d87ee5f0dbc

src/test/java/com/android/tools/r8/BackportedMethodListTest.java

diff --git a/src/test/java/com/android/tools/r8/BackportedMethodListTest.java b/src/test/java/com/android/tools/r8/BackportedMethodListTest.java
index 7ddc6be..b2b78d1 100644
--- a/src/test/java/com/android/tools/r8/BackportedMethodListTest.java
+++ b/src/test/java/com/android/tools/r8/BackportedMethodListTest.java
@@ -91,8 +91,7 @@
     // Java 9, 10 and 11 method added at API level S.
     // The method is not backported in desugared library JDK 11 (already present).
     assertEquals(
-        (mode == Mode.LIBRARY_DESUGAR && !isJDK11DesugaredLibrary())
-            || apiLevel < AndroidApiLevel.S.getLevel(),
+        apiLevel < AndroidApiLevel.S.getLevel(),
         backports.contains("java/util/List#copyOf(Ljava/util/Collection;)Ljava/util/List;"));
 
     // Java 9, 10 and 11 methods not yet added.
@@ -105,7 +104,7 @@
     builder
         .addDesugaredLibraryConfiguration(
             StringResource.fromFile(ToolHelper.getDesugarLibJsonForTesting()))
-        .addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.P.getLevel()));
+        .addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.R.getLevel()));
   }
 
   @Test