Fix resolution assertions in desugared library
Change-Id: I56e15a3bba9108934f54103e052e407068f11344
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryContentTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryContentTest.java
index fb817c5..84592ab 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryContentTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryContentTest.java
@@ -146,6 +146,12 @@
build, options, ThreadUtils.getExecutorService(1));
Map<DexMethod, Object> failures = new IdentityHashMap<>();
for (FoundClassSubject clazz : inspector.allClasses()) {
+ if (clazz.toString().startsWith("j$.sun.nio.cs.UTF_8")
+ && parameters.getApiLevel().isGreaterThanOrEqualTo(AndroidApiLevel.O)) {
+ // At high API level, the class UTF_8 is there just for resolution, the field access is
+ // retargeted and the code is unused so it's ok if it does not resolve.
+ continue;
+ }
for (FoundMethodSubject method : clazz.allMethods()) {
if (method.hasCode()) {
for (InstructionSubject instruction : method.instructions(InstructionSubject::isInvoke)) {
