Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future Bug: 337098550 Merged-In: I4efec36524ed470f790ab8f9f9319e3f5f26133a Change-Id: I72b3968abd91c6eb16f2e18363d36b0c9f84c428

diff --git a/tests/boot_tests.cpp b/tests/boot_tests.cpp
index 6264843..e8f0a24 100644
--- a/tests/boot_tests.cpp
+++ b/tests/boot_tests.cpp

@@ -41,7 +41,15 @@
     return hw_type == "automotive";
 }
 
+bool ShouldRequireMetadata() {
+    int api_level = android::base::GetIntProperty("ro.product.first_api_level", -1);
+    return api_level >= __ANDROID_API_R__;
+}
+
 TEST(MetadataPartition, FirstStageMount) {
+    if (!ShouldRequireMetadata()) {
+        GTEST_SKIP();
+    }
     Fstab fstab;
     if (ReadFstabFromDt(&fstab)) {
         auto entry = GetEntryForMountPoint(&fstab, "/metadata");
@@ -59,6 +67,9 @@
 }
 
 TEST(MetadataPartition, MinimumSize) {
+    if (!ShouldRequireMetadata()) {
+        GTEST_SKIP();
+    }
     Fstab fstab;
     ASSERT_TRUE(ReadDefaultFstab(&fstab));
 
@@ -109,10 +120,12 @@
 
         struct statfs64 fs;
         ASSERT_GE(statfs64(path.c_str(), &fs), 0) << path;
-        ASSERT_EQ(fs.f_type, F2FS_SUPER_MAGIC);
+        ASSERT_TRUE(fs.f_type == F2FS_SUPER_MAGIC || fs.f_type == EXT4_SUPER_MAGIC)
+                << "Unexpected filesystem type: " << fs.f_type;
 
         auto entry = GetEntryForMountPoint(&fstab, mount_point);
         ASSERT_NE(entry, nullptr);
-        ASSERT_EQ(entry->fs_type, "f2fs");
+        ASSERT_TRUE(entry->fs_type == "f2fs" || entry->fs_type == "ext4")
+                << "Unexpected filesystem type: " << entry->fs_type;
     }
 }