Reapply "Update API database base on android-VanillaIceCream SDK revision 4"
This reverts commit b9252047f712e7d6bd0ac4a0a0acabc19dc764b3.
Bug: b/343127842
Change-Id: I48bf3133447728b7ef70514105f8e25fbb6510a3
diff --git a/src/main/java/com/android/tools/r8/androidapi/AndroidApiLevelDatabaseHelper.java b/src/main/java/com/android/tools/r8/androidapi/AndroidApiLevelDatabaseHelper.java
index 58c1ae3..af5a909 100644
--- a/src/main/java/com/android/tools/r8/androidapi/AndroidApiLevelDatabaseHelper.java
+++ b/src/main/java/com/android/tools/r8/androidapi/AndroidApiLevelDatabaseHelper.java
@@ -22,6 +22,7 @@
notModeledTypes.add("androidx.annotation.RecentlyNonNull");
notModeledTypes.add("android.annotation.Nullable");
notModeledTypes.add("android.annotation.NonNull");
+ notModeledTypes.add("android.annotation.FlaggedApi");
return notModeledTypes;
}
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 ef3db54..1244c0f 100644
--- a/src/test/java/com/android/tools/r8/apimodel/AndroidApiHashingDatabaseBuilderGeneratorTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/AndroidApiHashingDatabaseBuilderGeneratorTest.java
@@ -110,9 +110,9 @@
methodReferences.forEach(field -> numberOfMethods.increment())));
});
// These numbers will change when updating api-versions.xml
- assertEquals(5904, parsedApiClasses.size());
- assertEquals(30073, numberOfFields.get());
- assertEquals(46091, numberOfMethods.get());
+ assertEquals(5971, parsedApiClasses.size());
+ assertEquals(30341, numberOfFields.get());
+ assertEquals(46572, numberOfMethods.get());
}
@Test
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 e6ee76a..d988c22 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() ? 1077 : 4, inspector.allClasses().size()));
+ inspector -> assertEquals(backend.isDex() ? 1091 : 4, inspector.allClasses().size()));
}
@Test
diff --git a/third_party/android_jar/lib-v35.tar.gz.sha1 b/third_party/android_jar/lib-v35.tar.gz.sha1
index f1f5b61..3543c83 100644
--- a/third_party/android_jar/lib-v35.tar.gz.sha1
+++ b/third_party/android_jar/lib-v35.tar.gz.sha1
@@ -1 +1 @@
-c9ad2358cc165f07fd68ef2151741ba12b26dcbc
\ No newline at end of file
+9ac3858ee6859c45500fa7c5254592516c5e73b7
\ 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 a3e3b5e..0d2c06c 100644
--- a/third_party/api_database/api_database.tar.gz.sha1
+++ b/third_party/api_database/api_database.tar.gz.sha1
@@ -1 +1 @@
-6fcae4d91999ef50dfbd2367c02270bc0ab9d2de
\ No newline at end of file
+b043b19332f3f7cd2578874b6d051462b55ac56a
\ No newline at end of file
