Re-enable ConcurrentHashMap desugaring on M
Bug: 134732760
Change-Id: I3ee9274fb6a0356ad2c0464ebdef229f74f38c3e
diff --git a/src/main/java/com/android/tools/r8/DesugaredLibraryConfigurationForTesting.java b/src/main/java/com/android/tools/r8/DesugaredLibraryConfigurationForTesting.java
index 4229c4d..4a07bf4 100644
--- a/src/main/java/com/android/tools/r8/DesugaredLibraryConfigurationForTesting.java
+++ b/src/main/java/com/android/tools/r8/DesugaredLibraryConfigurationForTesting.java
@@ -21,12 +21,6 @@
private static Map<String, String> buildPrefixRewritingForProgramCompilationAllAndroid() {
return ImmutableMap.<String, String>builder()
.put("java.util.concurrent.ConcurrentHashMap", "j$.util.concurrent.ConcurrentHashMap")
- .putAll(buildPrefixRewritingForProgramCompilationAndroidOPlus())
- .build();
- }
-
- private static Map<String, String> buildPrefixRewritingForProgramCompilationAndroidOPlus() {
- return ImmutableMap.<String, String>builder()
.put("java.util.stream.", "j$.util.stream.")
.put("java.util.function.", "j$.util.function.")
.put("java.util.DoubleSummaryStatistics", "j$.util.DoubleSummaryStatistics")
@@ -110,12 +104,6 @@
private static Map<String, String> buildPrefixRewritingForCoreLibCompilationAllAndroid() {
return ImmutableMap.<String, String>builder()
.put("java.util.concurrent.ConcurrentHashMap", "j$.util.concurrent.ConcurrentHashMap")
- .putAll(buildPrefixRewritingForCoreLibCompilationAndroidOPlus())
- .build();
- }
-
- private static Map<String, String> buildPrefixRewritingForCoreLibCompilationAndroidOPlus() {
- return ImmutableMap.<String, String>builder()
.put("java.util.stream.", "j$.util.stream.")
.put("java.util.function.", "j$.util.function.")
.put("java.util.Comparators", "j$.util.Comparators")
@@ -194,11 +182,7 @@
Map<String, String> emulateLibraryInterface = ImmutableMap.of();
List<String> dontRewriteInvocations = ImmutableList.of();
if (minApiLevel < AndroidApiLevel.N.getLevel()) {
- if (minApiLevel < AndroidApiLevel.M.getLevel()) {
- rewritePrefix = buildPrefixRewritingForProgramCompilationAllAndroid();
- } else {
- rewritePrefix = buildPrefixRewritingForProgramCompilationAndroidOPlus();
- }
+ rewritePrefix = buildPrefixRewritingForProgramCompilationAllAndroid();
retargetCoreLibMember = buildRetargetCoreLibraryMemberForProgramCompilationAllAndroid();
emulateLibraryInterface = buildEmulateLibraryInterface();
dontRewriteInvocations = buildDontRewriteInvocations();
@@ -230,11 +214,7 @@
retargetCoreLibMember = buildRetargetCoreLibraryMemberForCoreLibCompilation();
dontRewriteInvocations = buildDontRewriteInvocations();
emulateLibraryInterface = buildEmulateLibraryInterface();
- if (minApiLevel < AndroidApiLevel.M.getLevel()) {
- rewritePrefix = buildPrefixRewritingForCoreLibCompilationAllAndroid();
- } else {
- rewritePrefix = buildPrefixRewritingForCoreLibCompilationAndroidOPlus();
- }
+ rewritePrefix = buildPrefixRewritingForCoreLibCompilationAllAndroid();
} else {
rewritePrefix = buildPrefixRewritingForCoreLibCompilationAndroidNPlus();
}
diff --git a/src/test/java/com/android/tools/r8/L8CommandTest.java b/src/test/java/com/android/tools/r8/L8CommandTest.java
index 63079d7..525a9ec 100644
--- a/src/test/java/com/android/tools/r8/L8CommandTest.java
+++ b/src/test/java/com/android/tools/r8/L8CommandTest.java
@@ -99,7 +99,7 @@
}
@Test(expected = CompilationFailedException.class)
- public void specialLibraryConfigurationRequired() throws Throwable {
+ public void desugaredLibraryConfigurationRequired() throws Throwable {
DiagnosticsChecker.checkErrorsContains(
"L8 requires a desugared library configuration",
(handler) ->
diff --git a/src/test/java/com/android/tools/r8/desugar/corelib/corelibjdktests/Jdk11StreamTests.java b/src/test/java/com/android/tools/r8/desugar/corelib/corelibjdktests/Jdk11StreamTests.java
index eb9bd18..8a36cd6 100644
--- a/src/test/java/com/android/tools/r8/desugar/corelib/corelibjdktests/Jdk11StreamTests.java
+++ b/src/test/java/com/android/tools/r8/desugar/corelib/corelibjdktests/Jdk11StreamTests.java
@@ -190,8 +190,6 @@
@Test
public void testStream() throws Exception {
- // TODO(b/139834373): Make the tests pass on 6.0.1.
- Assume.assumeFalse(parameters.getRuntime().asDex().getVm().getVersion() == Version.V6_0_1);
// TODO(b/137876068): It seems to fail on windows because the method.
// getAllFilesWithSuffixInDirectory() finds different files on Windows (To be confirmed), so
// compilation is then different and raises an error.
diff --git a/src/test/java/com/android/tools/r8/desugar/corelib/desugar_jdk_libs.json b/src/test/java/com/android/tools/r8/desugar/corelib/desugar_jdk_libs.json
index af89cd4..3b21d6a 100644
--- a/src/test/java/com/android/tools/r8/desugar/corelib/desugar_jdk_libs.json
+++ b/src/test/java/com/android/tools/r8/desugar/corelib/desugar_jdk_libs.json
@@ -34,7 +34,8 @@
"java.util.Tripwire": "j$.util.Tripwire",
"java.util.concurrent.DesugarUnsafe": "j$.util.concurrent.DesugarUnsafe",
"java.util.concurrent.ThreadLocalRandom": "j$.util.concurrent.ThreadLocalRandom",
- "java.util.concurrent.atomic.DesugarAtomic": "j$.util.concurrent.atomic.DesugarAtomic"
+ "java.util.concurrent.atomic.DesugarAtomic": "j$.util.concurrent.atomic.DesugarAtomic",
+ "java.util.concurrent.ConcurrentHashMap": "j$.util.concurrent.ConcurrentHashMap"
},
"retarget_lib_member": {
"java.util.Arrays#stream": "java.util.DesugarArrays",
@@ -55,12 +56,6 @@
"java.util.Set": "j$.util.Set",
"java.util.concurrent.ConcurrentMap": "j$.util.concurrent.ConcurrentMap"
}
- },
- {
- "api_level_below_or_equal": 22,
- "rewrite_prefix": {
- "java.util.concurrent.ConcurrentHashMap": "j$.util.concurrent.ConcurrentHashMap"
- }
}
],
"program_flags": [
@@ -91,7 +86,8 @@
"java.util.Spliterator": "j$.util.Spliterator",
"java.util.StringJoiner": "j$.util.StringJoiner",
"java.util.concurrent.ThreadLocalRandom": "j$.util.concurrent.ThreadLocalRandom",
- "java.util.concurrent.atomic.DesugarAtomic": "j$.util.concurrent.atomic.DesugarAtomic"
+ "java.util.concurrent.atomic.DesugarAtomic": "j$.util.concurrent.atomic.DesugarAtomic",
+ "java.util.concurrent.ConcurrentHashMap": "j$.util.concurrent.ConcurrentHashMap"
},
"retarget_lib_member": {
"java.util.Arrays#stream": "java.util.DesugarArrays",
@@ -124,12 +120,6 @@
"java.util.Set": "j$.util.Set",
"java.util.concurrent.ConcurrentMap": "j$.util.concurrent.ConcurrentMap"
}
- },
- {
- "api_level_below_or_equal": 22,
- "rewrite_prefix": {
- "java.util.concurrent.ConcurrentHashMap": "j$.util.concurrent.ConcurrentHashMap"
- }
}
]
}
