summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-07-21 20:44:24 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-07-21 20:44:24 +0000
commiteb6466b46cc2948a56ac08fc0e9c825b429f19a9 (patch)
tree23ffb0e285a8b9d701fab60a7c436f39969f8320
parentb92670bf8d985e47a17b0d742b6d60aa812e25ed (diff)
parentfb8eacf653f036400aea981a1bc219101457e066 (diff)
downloadgsid-android13-mainline-go-media-swcodec-release.tar.gz
Snap for 8857176 from fb8eacf653f036400aea981a1bc219101457e066 to mainline-go-media-swcodec-releaseaml_go_swc_330913000android13-mainline-go-media-swcodec-release
Change-Id: Iae3c8474b96dd03b71d335b89dba827c02b2677f
-rw-r--r--tests/boot_tests.cpp8
1 files changed, 2 insertions, 6 deletions
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 @@ TEST(MetadataPartition, MinimumSize) {
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 @@ TEST(MetadataPartition, FsType) {
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";