Change the backported value of android.os.Build.VERSION_CODES_FULL.BAKLAVA
From 1.000.000.000 to 3.600.000.
The value was changed between the Baklava SDK revision 3 and revision 5.
Bug: b/401489623
Change-Id: I117585a1963c78f63be4e78663e5b8ce7dbc087b
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java b/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
index 0743777..ac6e9cc 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
@@ -1859,7 +1859,7 @@
{"TIRAMISU", 3300_000},
{"UPSIDE_DOWN_CAKE", 3400_000},
{"VANILLA_ICE_CREAM", 3500_000},
- {"BAKLAVA", 1_000_000_000},
+ {"BAKLAVA", 3600_000},
};
type = factory.createType("Landroid/os/Build$VERSION_CODES_FULL;");
for (Object[] versionCodeFull : versionCodesFull) {
diff --git a/src/test/java/com/android/tools/r8/desugar/backports/AndroidOsBuildVersionCodesFullBackportTest.java b/src/test/java/com/android/tools/r8/desugar/backports/AndroidOsBuildVersionCodesFullBackportTest.java
index 44b6347..9ecf156 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/AndroidOsBuildVersionCodesFullBackportTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/AndroidOsBuildVersionCodesFullBackportTest.java
@@ -141,7 +141,7 @@
{"TIRAMISU", 3300_000},
{"UPSIDE_DOWN_CAKE", 3400_000},
{"VANILLA_ICE_CREAM", 3500_000},
- {"BAKLAVA", 1_000_000_000},
+ {"BAKLAVA", 3600_000},
};
for (Object[] versionCodeFull : versionCodesFull) {
Assert.assertEquals(
@@ -238,7 +238,7 @@
assertEquals(3300_000, VERSION_CODES_FULL.TIRAMISU);
assertEquals(3400_000, VERSION_CODES_FULL.UPSIDE_DOWN_CAKE);
assertEquals(3500_000, VERSION_CODES_FULL.VANILLA_ICE_CREAM);
- assertEquals(1_000_000_000, VERSION_CODES_FULL.BAKLAVA);
+ assertEquals(3600_000, VERSION_CODES_FULL.BAKLAVA);
}
}
}
