Update desugared library legacy configuration
1. Use version 1.2.0 without pre-release
2. Update configuration format version to 5 to only support
it on selected versions (will only merge this to the 3.3 branch)
3. Update configuration to work without un-desugaring
4. Add a test of L8 compilation simulating the AGP use case.
Bug: b/203382252
Bug: b/231922825
Bug: b/231695765
Change-Id: Icf02ac365606a7a6bf8fb7e36f8f62739c69b418
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs_legacy.json b/src/library_desugar/jdk11/desugar_jdk_libs_legacy.json
index 1985550..98b31a2 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs_legacy.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs_legacy.json
@@ -1,8 +1,8 @@
{
- "configuration_format_version": 4,
+ "configuration_format_version": 5,
"group_id" : "com.tools.android",
"artifact_id" : "desugar_jdk_libs",
- "version": "1.2.0-alpha01",
+ "version": "1.2.0",
"required_compilation_api_level": 30,
"synthesized_library_classes_package_prefix": "j$.",
"support_all_callbacks_from_library": true,
@@ -170,6 +170,8 @@
"api_level_below_or_equal": 30,
"rewrite_prefix": {
"j$.time.": "java.time.",
+ "java.lang.Desugar": "j$.lang.Desugar",
+ "jdk.internal.": "j$.jdk.internal.",
"sun.misc.Desugar": "j$.sun.misc.Desugar",
"sun.security.action.": "j$.sun.security.action."
},
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/legacyspecification/LegacyDesugaredLibrarySpecificationParser.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/legacyspecification/LegacyDesugaredLibrarySpecificationParser.java
index 0fdbe35..328bbf4 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/legacyspecification/LegacyDesugaredLibrarySpecificationParser.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/legacyspecification/LegacyDesugaredLibrarySpecificationParser.java
@@ -27,7 +27,7 @@
public class LegacyDesugaredLibrarySpecificationParser {
- public static final int MAX_SUPPORTED_VERSION = 4;
+ public static final int MAX_SUPPORTED_VERSION = 5;
public static final SemanticVersion MIN_SUPPORTED_VERSION = SemanticVersion.create(1, 0, 9);
static final String VERSION_KEY = "version";
