commit a916f5a6163548d15bf02bd887ecc25f7072b112
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jul 21 23:29:25 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jul 21 23:29:25 2022 +0000
tree 23ffb0e285a8b9d701fab60a7c436f39969f8320
parent d16445d252ab0f217d53cad6d46be901bc7e05d4
parent 27eddfa0e056bccf58e25b2091d358b6dbfa509c

Snap for 8857231 from 27eddfa0e056bccf58e25b2091d358b6dbfa509c to tm-qpr1-release

Change-Id: I3f8a9801542573a723fa1c573b4a4bb4c770f1ae

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