commit 7c5eefacb5117cc9d080a99449c92aed538a9741
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Sep 12 10:17:48 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Sep 12 10:17:48 2022 +0000
tree 23ffb0e285a8b9d701fab60a7c436f39969f8320
parent cc7bec51e726215430c940ed1c3d2b00ba123a5d
parent fb8eacf653f036400aea981a1bc219101457e066

Snap for 9051867 from fb8eacf653f036400aea981a1bc219101457e066 to mainline-sdkext-release

Change-Id: I84b4b72b9ab4d53532f00ab3b8bc1fbbec18ccbc

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