commit 27eddfa0e056bccf58e25b2091d358b6dbfa509c
author David Anderson <dvander@google.com> Wed Jul 20 23:13:45 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 20 23:13:45 2022 +0000
tree 23ffb0e285a8b9d701fab60a7c436f39969f8320
parent 598e2517ea48a90c4702b827692713645cdb92dd
parent a55515f476db26af11c9bfbff7a8b8b9bffd22b5

Don't require F2FS for /metadata. am: 139ce4e166 am: 7940c0fa43 am: a55515f476

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/gsid/+/19368108

Change-Id: I144f1fcea8c141d1a8817eb54fec24386f7ab447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/boot_tests.cpp

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";