Ensure Machine Specification can be used
- Fix warning for invalid library
- Fix duplicated flags
Bug: b/238987119
Change-Id: Ia55763a154a053631824ae9ed3961182ff34cfca
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs_path.json b/src/library_desugar/jdk11/desugar_jdk_libs_path.json
index a00bb68..e1298de 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs_path.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs_path.json
@@ -309,16 +309,6 @@
}
},
{
- "api_level_below_or_equal": 25,
- "rewrite_prefix": {
- "java.io.DesugarFile": "j$.io.DesugarFile",
- "java.nio.file.": "j$.nio.file."
- },
- "retarget_method_with_emulated_dispatch": {
- "java.nio.file.Path java.io.File#toPath()": "java.io.DesugarFile"
- }
- },
- {
"api_level_below_or_equal": 23,
"retarget_method": {
"int java.util.concurrent.atomic.AtomicInteger#accumulateAndGet(int, java.util.function.IntBinaryOperator)": "java.util.concurrent.atomic.DesugarAtomicInteger",
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MachineDesugaredLibrarySpecification.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MachineDesugaredLibrarySpecification.java
index f4a6d2a..dad5fd5 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MachineDesugaredLibrarySpecification.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MachineDesugaredLibrarySpecification.java
@@ -12,6 +12,7 @@
import com.android.tools.r8.graph.FieldAccessFlags;
import com.android.tools.r8.graph.MethodAccessFlags;
import com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification;
+import com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LibraryValidator;
import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.SemanticVersion;
import com.android.tools.r8.utils.Timing;
@@ -225,6 +226,7 @@
@Override
public MachineDesugaredLibrarySpecification toMachineSpecification(
DexApplication app, Timing timing) throws IOException {
+ LibraryValidator.validate(app, libraryCompilation, getRequiredCompilationApiLevel());
return this;
}
