Fix desugared library 1.2.0
- Fix warning in api 23-28
- Update minAPI for library desugaring to 10000
since we now know some APIs were never introduced.
Bug: b/231927212
Change-Id: I598d404a597e34fae7976500e8b2e0c18f64b28f
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs_legacy.json b/src/library_desugar/jdk11/desugar_jdk_libs_legacy.json
index 98b31a2..ce1b3ff 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs_legacy.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs_legacy.json
@@ -8,7 +8,7 @@
"support_all_callbacks_from_library": true,
"common_flags": [
{
- "api_level_below_or_equal": 30,
+ "api_level_below_or_equal": 10000,
"rewrite_prefix": {
"java.time.": "j$.time.",
"java.util.Desugar": "j$.util.Desugar"
@@ -37,7 +37,13 @@
}
},
{
- "api_level_below_or_equal": 28,
+ "api_level_below_or_equal": 23,
+ "rewrite_prefix": {
+ "java.util.concurrent.atomic.DesugarAtomic": "j$.util.concurrent.atomic.DesugarAtomic"
+ }
+ },
+ {
+ "api_level_below_or_equal": 10000,
"rewrite_prefix": {
"java.util.DoubleSummaryStatistics": "j$.util.DoubleSummaryStatistics",
"java.util.IntSummaryStatistics": "j$.util.IntSummaryStatistics",
@@ -48,7 +54,6 @@
"java.util.StringJoiner": "j$.util.StringJoiner",
"java.util.concurrent.ConcurrentHashMap": "j$.util.concurrent.ConcurrentHashMap",
"java.util.concurrent.ThreadLocalRandom": "j$.util.concurrent.ThreadLocalRandom",
- "java.util.concurrent.atomic.DesugarAtomic": "j$.util.concurrent.atomic.DesugarAtomic",
"java.util.function.": "j$.util.function.",
"java.util.stream.": "j$.util.stream."
},
@@ -137,7 +142,7 @@
],
"program_flags": [
{
- "api_level_below_or_equal": 30,
+ "api_level_below_or_equal": 10000,
"retarget_lib_member": {
"java.util.TimeZone#getTimeZone": "java.util.DesugarTimeZone",
"java.util.Calendar#toInstant": "java.util.DesugarCalendar",
@@ -167,7 +172,7 @@
],
"library_flags": [
{
- "api_level_below_or_equal": 30,
+ "api_level_below_or_equal": 10000,
"rewrite_prefix": {
"j$.time.": "java.time.",
"java.lang.Desugar": "j$.lang.Desugar",
@@ -183,7 +188,7 @@
}
},
{
- "api_level_below_or_equal": 28,
+ "api_level_below_or_equal": 10000,
"rewrite_prefix": {
"java.util.AbstractList": "j$.util.AbstractList",
"java.util.CollSer": "j$.util.CollSer",
