Revert "Re-enable toArray desugaring"
This reverts commit 2c8b0516198e683c17bd9de1f415c6ad018430b4.
Reason for revert: breaks bots
Change-Id: Ia99db430dfda92edd0dc489779469327a905ceb8
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs.json b/src/library_desugar/jdk11/desugar_jdk_libs.json
index eccca60..df0df7b 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs.json
@@ -1,5 +1,5 @@
{
- "identifier": "com.tools.android:desugar_jdk_libs_configuration:2.1.0",
+ "identifier": "com.tools.android:desugar_jdk_libs_configuration:2.0.4",
"configuration_format_version": 101,
"required_compilation_api_level": 30,
"synthesized_library_classes_package_prefix": "j$.",
@@ -57,14 +57,6 @@
"rewrite_prefix": {
"java.util.concurrent.DesugarTimeUnit": "j$.util.concurrent.DesugarTimeUnit"
},
- "emulate_interface": {
- "java.util.Collection": {
- "rewrittenType": "j$.util.Collection",
- "emulatedMethods": [
- "java.lang.Object[] java.util.Collection#toArray(java.util.function.IntFunction)"
- ]
- }
- },
"retarget_method": {
"java.util.concurrent.TimeUnit java.util.concurrent.TimeUnit#of(java.time.temporal.ChronoUnit)": "java.util.concurrent.DesugarTimeUnit",
"java.time.temporal.ChronoUnit java.util.concurrent.TimeUnit#toChronoUnit()": "java.util.concurrent.DesugarTimeUnit",
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json b/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json
index 7303240..d69ed9a 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json
@@ -1,5 +1,5 @@
{
- "identifier": "com.tools.android:desugar_jdk_libs_configuration_minimal:2.1.0",
+ "identifier": "com.tools.android:desugar_jdk_libs_configuration_minimal:2.0.4",
"configuration_format_version": 101,
"required_compilation_api_level": 24,
"synthesized_library_classes_package_prefix": "j$.",
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs_nio.json b/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
index 28cc15f..29e4e26 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
@@ -1,5 +1,5 @@
{
- "identifier": "com.tools.android:desugar_jdk_libs_configuration_nio:2.1.0",
+ "identifier": "com.tools.android:desugar_jdk_libs_configuration_nio:2.0.4",
"configuration_format_version": 101,
"required_compilation_api_level": 30,
"synthesized_library_classes_package_prefix": "j$.",
@@ -76,14 +76,6 @@
"java.io.DesugarInputStream": "j$.io.DesugarInputStream",
"java.util.concurrent.DesugarTimeUnit": "j$.util.concurrent.DesugarTimeUnit"
},
- "emulate_interface": {
- "java.util.Collection": {
- "rewrittenType": "j$.util.Collection",
- "emulatedMethods": [
- "java.lang.Object[] java.util.Collection#toArray(java.util.function.IntFunction)"
- ]
- }
- },
"retarget_method": {
"java.util.concurrent.TimeUnit java.util.concurrent.TimeUnit#of(java.time.temporal.ChronoUnit)": "java.util.concurrent.DesugarTimeUnit",
"java.time.temporal.ChronoUnit java.util.concurrent.TimeUnit#toChronoUnit()": "java.util.concurrent.DesugarTimeUnit",
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/PartialDesugaringTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/PartialDesugaringTest.java
index 2d01320..7d29fa4 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/PartialDesugaringTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/PartialDesugaringTest.java
@@ -217,10 +217,14 @@
&& api.isLessThan(AndroidApiLevel.T)) {
expectedFailures.addAll(FAILURES_FILE_STORE);
}
- if (librarySpecification == JDK8
- && api.isLessThan(AndroidApiLevel.T)
- && api.isGreaterThanOrEqualTo(AndroidApiLevel.N)) {
- expectedFailures.addAll(FAILURES_TO_ARRAY);
+ if (librarySpecification != JDK11_MINIMAL && api.isLessThan(AndroidApiLevel.T)) {
+ if (librarySpecification == JDK8) {
+ if (api.isGreaterThanOrEqualTo(AndroidApiLevel.N)) {
+ expectedFailures.addAll(FAILURES_TO_ARRAY);
+ }
+ } else {
+ expectedFailures.addAll(FAILURES_TO_ARRAY);
+ }
}
if (jdk11NonMinimal
&& api.isGreaterThanOrEqualTo(AndroidApiLevel.O)
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/CollectionToArrayTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/CollectionToArrayTest.java
index 8d1e773..bd5554af 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/CollectionToArrayTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/CollectionToArrayTest.java
@@ -54,6 +54,7 @@
this.compilationSpecification = compilationSpecification;
}
+ @Ignore("b/266401747")
@Test
public void test() throws Throwable {
testForDesugaredLibrary(parameters, libraryDesugaringSpecification, compilationSpecification)
