Update Baklava (API level 36) SDK to revision 3
Change-Id: Idff77a6a31b318351b072ffd3090646da38964c7
diff --git a/src/test/examplesJava21/twr/LookUpCloseResourceTest.java b/src/test/examplesJava21/twr/LookUpCloseResourceTest.java
index b82f983..8ae6e04 100644
--- a/src/test/examplesJava21/twr/LookUpCloseResourceTest.java
+++ b/src/test/examplesJava21/twr/LookUpCloseResourceTest.java
@@ -137,8 +137,8 @@
toSuper.remove(dexType);
}
- Assert.assertEquals(10, toSuper.size());
- Assert.assertEquals(11, classIntroducedBeforeClose.size());
+ Assert.assertEquals(9, toSuper.size());
+ Assert.assertEquals(12, classIntroducedBeforeClose.size());
Assert.assertEquals(6, closeBackports.size());
if (DEBUG_PRINT) {
diff --git a/src/test/java/com/android/tools/r8/apimodel/AndroidApiHashingDatabaseBuilderGeneratorTest.java b/src/test/java/com/android/tools/r8/apimodel/AndroidApiHashingDatabaseBuilderGeneratorTest.java
index 115666c..a731b33 100644
--- a/src/test/java/com/android/tools/r8/apimodel/AndroidApiHashingDatabaseBuilderGeneratorTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/AndroidApiHashingDatabaseBuilderGeneratorTest.java
@@ -126,9 +126,9 @@
methodReferences.forEach(field -> numberOfMethods.increment())));
});
// These numbers will change when updating api-versions.xml
- assertEquals(6031, parsedApiClasses.size());
- assertEquals(30501, numberOfFields.get());
- assertEquals(46885, numberOfMethods.get());
+ assertEquals(6084, parsedApiClasses.size());
+ assertEquals(30817, numberOfFields.get());
+ assertEquals(47289, numberOfMethods.get());
}
private static String sampleVersion4ApiVersionsXml =
diff --git a/src/test/java/com/android/tools/r8/globalsynthetics/GlobalSyntheticsEnsureClassesOutputTest.java b/src/test/java/com/android/tools/r8/globalsynthetics/GlobalSyntheticsEnsureClassesOutputTest.java
index a19c8e9..affeb5a 100644
--- a/src/test/java/com/android/tools/r8/globalsynthetics/GlobalSyntheticsEnsureClassesOutputTest.java
+++ b/src/test/java/com/android/tools/r8/globalsynthetics/GlobalSyntheticsEnsureClassesOutputTest.java
@@ -58,7 +58,7 @@
.setMinApi(AndroidApiLevel.K)
.compile()
.inspect(
- inspector -> assertEquals(backend.isDex() ? 1104 : 4, inspector.allClasses().size()));
+ inspector -> assertEquals(backend.isDex() ? 1115 : 4, inspector.allClasses().size()));
}
@Test
diff --git a/third_party/android_jar/lib-v36.tar.gz.sha1 b/third_party/android_jar/lib-v36.tar.gz.sha1
index 939f711..de23b92 100644
--- a/third_party/android_jar/lib-v36.tar.gz.sha1
+++ b/third_party/android_jar/lib-v36.tar.gz.sha1
@@ -1 +1 @@
-f6fe8070ccad90b10d1bcc28a90f5befd3d9afb4
\ No newline at end of file
+c31c4d657a3bd7376f73cd8b6d7e55bbcd7c6e39
\ No newline at end of file
diff --git a/third_party/api_database/api_database.tar.gz.sha1 b/third_party/api_database/api_database.tar.gz.sha1
index b81dbaf..603cda4 100644
--- a/third_party/api_database/api_database.tar.gz.sha1
+++ b/third_party/api_database/api_database.tar.gz.sha1
@@ -1 +1 @@
-912f0e6d9fb5e1789c458801f3ed8e6c4e700767
\ No newline at end of file
+65e3e25f7c5c1ecd5cf31084e5f0e0394c53800a
\ No newline at end of file
