Move away from FileSystem pre-desugaring.
Change-Id: I3f3beec1317d71af323dd5eec1287cd73abc6f43
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs_path.json b/src/library_desugar/jdk11/desugar_jdk_libs_path.json
index f4e017a..761e341 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs_path.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs_path.json
@@ -374,6 +374,12 @@
"java.util.ConversionRuntimeException": "j$.util.ConversionRuntimeException"
},
"rewrite_derived_prefix": {
+ "desugar.sun.nio.fs.DesugarDefaultFileSystemProvider": {
+ "sun.nio.fs.DefaultFileSystemProvider": "j$.adapter.HybridFileSystemProvider"
+ },
+ "desugar.sun.nio.fs.DesugarDefaultFileTypeDetector": {
+ "sun.nio.fs.DefaultFileTypeDetector": "j$.adapter.HybridFileTypeDetector"
+ },
"sun.misc.DesugarUnsafe": {
"jdk.internal.misc.Unsafe" : "j$.sun.misc.DesugarUnsafe"
},
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/DesugaredLibraryJDK11Undesugarer.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/DesugaredLibraryJDK11Undesugarer.java
index 781bd6f..072f159 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/DesugaredLibraryJDK11Undesugarer.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/DesugaredLibraryJDK11Undesugarer.java
@@ -35,8 +35,8 @@
.put("java/io/DesugarBufferedReader", "java/io/BufferedReader")
.put("java/io/DesugarInputStream", "java/io/InputStream")
.put("sun/misc/DesugarUnsafe", "jdk/internal/misc/Unsafe")
- .put("wrapper/adapter/HybridFileSystemProvider", "java/adapter/HybridFileSystemProvider")
- .put("wrapper/adapter/HybridFileTypeDetector", "java/adapter/HybridFileTypeDetector")
+ .put("wrapper/adapter/HybridFileSystemProvider", "sun/nio/fs/DefaultFileSystemProvider")
+ .put("wrapper/adapter/HybridFileTypeDetector", "sun/nio/fs/DefaultFileTypeDetector")
.build();
public static Path undesugaredJarJDK11(Path undesugarFolder, Path jdk11Jar) {
