Allow desugared library to start with java
Fix red bot
Change-Id: I8e0dcf984b09b43cb68daf14a9259d015a44a17a
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 3b41b98..6ce91e1 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
@@ -30,6 +30,7 @@
import com.android.tools.r8.utils.codeinspector.InstructionSubject;
import java.nio.file.Path;
import java.util.ArrayList;
+import org.hamcrest.CoreMatchers;
import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -130,7 +131,13 @@
}
private void assertCorrect(CodeInspector inspector) {
- inspector.allClasses().forEach(clazz -> assertThat(clazz.getOriginalName(), startsWith("j$.")));
+ inspector
+ .allClasses()
+ .forEach(
+ clazz ->
+ assertThat(
+ clazz.getOriginalName(),
+ CoreMatchers.anyOf(startsWith("j$."), startsWith("java."))));
assertThat(inspector.clazz("j$.time.Clock"), isPresent());
// Above N the following classes are removed instead of being desugared.
if (parameters.getApiLevel().getLevel() >= AndroidApiLevel.N.getLevel()) {
