Skip unknown api level in LintFilesTest.
Fixes: 196538044
Change-Id: I4daaf443d5b4d0c64afc21c4824325ef5c8c2d54
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LintFilesTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LintFilesTest.java
index f253398..5e1b8c0 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LintFilesTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/LintFilesTest.java
@@ -26,7 +26,6 @@
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
-import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -113,10 +112,6 @@
@Test
public void testFileContent() throws Exception {
- // Test require r8.jar not r8lib.jar, as the class com.android.tools.r8.GenerateLintFiles in
- // not kept.
- Assume.assumeTrue(!ToolHelper.isTestingR8Lib());
-
Path directory = temp.newFolder().toPath();
GenerateLintFiles.main(
new String[] {
@@ -131,6 +126,9 @@
.parse(StringResource.fromFile(ToolHelper.getDesugarLibJsonForTesting()));
for (AndroidApiLevel apiLevel : AndroidApiLevel.values()) {
+ if (apiLevel == AndroidApiLevel.UNKNOWN) {
+ continue;
+ }
Path compileApiLevelDirectory = directory.resolve("compile_api_level_" + apiLevel.getLevel());
if (apiLevel.getLevel()
< desugaredLibraryConfiguration.getRequiredCompilationApiLevel().getLevel()) {
