Merge tag 'android-13.0.0_r16' into int/13/fp3
Android 13.0.0 Release 16 (TQ1A.221205.011)
* tag 'android-13.0.0_r16':
Don't require F2FS for /metadata.
Change-Id: I0d4687ebbe6bef929de58d68e672d59aef028f4c
diff --git a/tests/boot_tests.cpp b/tests/boot_tests.cpp
index d002c89..6aeded3 100644
--- a/tests/boot_tests.cpp
+++ b/tests/boot_tests.cpp
@@ -63,11 +63,7 @@
ASSERT_GE(fd, 0);
uint64_t size = get_block_device_size(fd);
- if (GetVsrLevel() >= __ANDROID_API_T__) {
- ASSERT_GE(size, 67108864);
- } else {
- ASSERT_GE(size, 16777216);
- }
+ ASSERT_GE(size, 16777216);
}
TEST(Weaver, MinimumSlots) {
@@ -96,7 +92,7 @@
Fstab fstab;
ASSERT_TRUE(ReadDefaultFstab(&fstab));
- std::vector<std::string> mount_points = {"/data", "/metadata"};
+ std::vector<std::string> mount_points = {"/data"};
for (const auto& mount_point : mount_points) {
auto path = mount_point + "/gsi";