[library desugar] Remove desugaring of ConcurrentLinkedQueue
VarHandle desugaring is required for this, and that is not supported
in any released versions of D8 & R8.
Bug: b/267483394
Change-Id: Ie27acfe55110ca18c0043a43431b90b379cbf459
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs.json b/src/library_desugar/jdk11/desugar_jdk_libs.json
index b30e713f..15cf883 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.0.1",
+ "identifier": "com.tools.android:desugar_jdk_libs_configuration:2.0.2",
"configuration_format_version": 100,
"required_compilation_api_level": 30,
"synthesized_library_classes_package_prefix": "j$.",
@@ -55,8 +55,7 @@
{
"api_level_below_or_equal": 32,
"rewrite_prefix": {
- "java.util.concurrent.DesugarTimeUnit": "j$.util.concurrent.DesugarTimeUnit",
- "java.util.concurrent.ConcurrentLinkedQueue": "j$.util.concurrent.ConcurrentLinkedQueue"
+ "java.util.concurrent.DesugarTimeUnit": "j$.util.concurrent.DesugarTimeUnit"
},
"retarget_method": {
"java.util.concurrent.TimeUnit java.util.concurrent.TimeUnit#of(java.time.temporal.ChronoUnit)": "java.util.concurrent.DesugarTimeUnit",
@@ -322,12 +321,6 @@
],
"library_flags": [
{
- "api_level_below_or_equal": 32,
- "rewrite_prefix": {
- "java.util.concurrent.Helpers": "j$.util.concurrent.Helpers"
- }
- },
- {
"api_level_below_or_equal": 30,
"rewrite_prefix": {
"jdk.internal.": "j$.jdk.internal.",
@@ -370,6 +363,7 @@
"java.util.KeyValueHolder": "j$.util.KeyValueHolder",
"java.util.SortedSet$1": "j$.util.SortedSet$1",
"java.util.Tripwire": "j$.util.Tripwire",
+ "java.util.concurrent.Helpers": "j$.util.concurrent.Helpers",
"java.util.ConversionRuntimeException": "j$.util.ConversionRuntimeException"
},
"rewrite_derived_prefix": {
@@ -408,9 +402,6 @@
"-keepclassmembers class j$.util.concurrent.ConcurrentHashMap$TreeBin { int lockState; }",
"-keepclassmembers class j$.util.concurrent.ConcurrentHashMap { int sizeCtl; int transferIndex; long baseCount; int cellsBusy; }",
"-keepclassmembers class j$.util.concurrent.ConcurrentHashMap$CounterCell { long value; }",
- "-keepclassmembers class j$.util.concurrent.ConcurrentLinkedQueue { j$.util.concurrent.ConcurrentLinkedQueue$Node head; j$.util.concurrent.ConcurrentLinkedQueue$Node tail; }",
- "-keep,allowshrinking class j$.util.concurrent.ConcurrentLinkedQueue$Node",
- "-keepclassmembers class j$.util.concurrent.ConcurrentLinkedQueue$Node { j$.util.concurrent.ConcurrentLinkedQueue$Node next; java.lang.Object item; }",
"-keepclassmembers enum * { public static **[] values(); public static ** valueOf(java.lang.String); public static final !synthetic <fields>; }",
"-keeppackagenames java.**",
"-keeppackagenames j$.**",
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json b/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json
index a958c8b..fb728c1 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs_minimal.json
@@ -1,17 +1,11 @@
{
- "identifier": "com.tools.android:desugar_jdk_libs_configuration_minimal:2.0.1",
+ "identifier": "com.tools.android:desugar_jdk_libs_configuration_minimal:2.0.2",
"configuration_format_version": 100,
"required_compilation_api_level": 24,
"synthesized_library_classes_package_prefix": "j$.",
"support_all_callbacks_from_library": false,
"common_flags": [
{
- "api_level_below_or_equal": 32,
- "rewrite_prefix": {
- "java.util.concurrent.ConcurrentLinkedQueue": "j$.util.concurrent.ConcurrentLinkedQueue"
- }
- },
- {
"api_level_below_or_equal": 23,
"rewrite_prefix": {
"java.util.concurrent.ConcurrentHashMap": "j$.util.concurrent.ConcurrentHashMap",
@@ -25,14 +19,9 @@
"program_flags": [],
"library_flags": [
{
- "api_level_below_or_equal": 32,
- "rewrite_prefix": {
- "java.util.concurrent.Helpers": "j$.util.concurrent.Helpers"
- }
- },
- {
"api_level_below_or_equal": 23,
"rewrite_prefix": {
+ "java.util.concurrent.Helpers": "j$.util.concurrent.Helpers",
"sun.misc.Desugar": "j$.sun.misc.Desugar"
},
"rewrite_derived_prefix": {
@@ -48,9 +37,6 @@
"-keepclassmembers class j$.util.concurrent.ConcurrentHashMap { int sizeCtl; int transferIndex; long baseCount; int cellsBusy; }",
"-keepclassmembers class j$.util.concurrent.ConcurrentHashMap$CounterCell { long value; }",
"-keepclassmembers enum * { public static **[] values(); public static ** valueOf(java.lang.String); }",
- "-keepclassmembers class j$.util.concurrent.ConcurrentLinkedQueue { j$.util.concurrent.ConcurrentLinkedQueue$Node head; j$.util.concurrent.ConcurrentLinkedQueue$Node tail; }",
- "-keep,allowshrinking class j$.util.concurrent.ConcurrentLinkedQueue$Node",
- "-keepclassmembers class j$.util.concurrent.ConcurrentLinkedQueue$Node { j$.util.concurrent.ConcurrentLinkedQueue$Node next; java.lang.Object item; }",
"-keeppackagenames java.**",
"-keeppackagenames j$.**",
"-keepattributes Signature",
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs_nio.json b/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
index 778c395..8d8c7a4 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.0.1",
+ "identifier": "com.tools.android:desugar_jdk_libs_configuration_nio:2.0.2",
"configuration_format_version": 100,
"required_compilation_api_level": 30,
"synthesized_library_classes_package_prefix": "j$.",
@@ -74,8 +74,7 @@
"java.net.URLDecoder": "j$.net.URLDecoder",
"java.net.URLEncoder": "j$.net.URLEncoder",
"java.io.DesugarInputStream": "j$.io.DesugarInputStream",
- "java.util.concurrent.DesugarTimeUnit": "j$.util.concurrent.DesugarTimeUnit",
- "java.util.concurrent.ConcurrentLinkedQueue": "j$.util.concurrent.ConcurrentLinkedQueue"
+ "java.util.concurrent.DesugarTimeUnit": "j$.util.concurrent.DesugarTimeUnit"
},
"retarget_method": {
"java.util.concurrent.TimeUnit java.util.concurrent.TimeUnit#of(java.time.temporal.ChronoUnit)": "java.util.concurrent.DesugarTimeUnit",
@@ -518,8 +517,7 @@
"rewrite_prefix": {
"desugar.": "j$.desugar.",
"libcore.": "j$.libcore.",
- "sun.security.action.": "j$.sun.security.action.",
- "java.util.concurrent.Helpers": "j$.util.concurrent.Helpers"
+ "sun.security.action.": "j$.sun.security.action."
}
},
{
@@ -631,9 +629,6 @@
"-keepclassmembers class j$.util.concurrent.ConcurrentHashMap$TreeBin { int lockState; }",
"-keepclassmembers class j$.util.concurrent.ConcurrentHashMap { int sizeCtl; int transferIndex; long baseCount; int cellsBusy; }",
"-keepclassmembers class j$.util.concurrent.ConcurrentHashMap$CounterCell { long value; }",
- "-keepclassmembers class j$.util.concurrent.ConcurrentLinkedQueue { j$.util.concurrent.ConcurrentLinkedQueue$Node head; j$.util.concurrent.ConcurrentLinkedQueue$Node tail; }",
- "-keep,allowshrinking class j$.util.concurrent.ConcurrentLinkedQueue$Node",
- "-keepclassmembers class j$.util.concurrent.ConcurrentLinkedQueue$Node { j$.util.concurrent.ConcurrentLinkedQueue$Node next; java.lang.Object item; }",
"-keepclassmembers enum * { public static **[] values(); public static ** valueOf(java.lang.String); public static final !synthetic <fields>; }",
"-keeppackagenames java.**",
"-keeppackagenames j$.**",
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/ConcurrentLinkedQueueTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/ConcurrentLinkedQueueTest.java
index b4028c9..ab8e8bd 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/ConcurrentLinkedQueueTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/ConcurrentLinkedQueueTest.java
@@ -27,6 +27,7 @@
import java.util.List;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -128,6 +129,7 @@
}
@Test
+ @Ignore("b/267483394")
public void test() throws Exception {
testForDesugaredLibrary(parameters, libraryDesugaringSpecification, compilationSpecification)
.addInnerClasses(getClass())
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11ConcurrentLinkedQueueTests.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11ConcurrentLinkedQueueTests.java
index 65cd338..d8bc956 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11ConcurrentLinkedQueueTests.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11ConcurrentLinkedQueueTests.java
@@ -43,6 +43,7 @@
import java.util.Collections;
import java.util.List;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -197,6 +198,7 @@
}
@Test
+ @Ignore("b/267483394")
public void testWhiteBox() throws Exception {
runTest(ImmutableList.of("WhiteBox"));
}
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11Jsr166Tests.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11Jsr166Tests.java
index ed16c03..c43800c 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11Jsr166Tests.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11Jsr166Tests.java
@@ -39,6 +39,7 @@
import java.util.List;
import java.util.stream.Collectors;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -229,6 +230,7 @@
}
@Test
+ @Ignore("b/267483394")
public void test() throws Exception {
runTest(
ImmutableList.of(
