VTS: Elf alignment test: Don't allow opting out of required ELF alignment
Larger ELF alignment is now a "Must" as opposed to the before "Strongly
reccommended", in the VSR requirements.
Update the test to reflect this.
Test: atest -c elf_alignment_test
Bug: 335449682
Change-Id: If386bc65a5dfe5ac30d83f47119d2740c68f87f2
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
diff --git a/libelf64/tests/page_size_16kb/elf_alignment_test.cpp b/libelf64/tests/page_size_16kb/elf_alignment_test.cpp
index ee53666..dfcab4e 100644
--- a/libelf64/tests/page_size_16kb/elf_alignment_test.cpp
+++ b/libelf64/tests/page_size_16kb/elf_alignment_test.cpp
@@ -28,7 +28,6 @@
#include <android-base/strings.h>
constexpr char kLowRamProp[] = "ro.config.low_ram";
-constexpr char kProductMaxPageSizeProp[] = "ro.product.cpu.pagesize.max";
constexpr char kVendorApiLevelProp[] = "ro.vendor.api_level";
// 16KB by default (unsupported devices must explicitly opt-out)
constexpr size_t kRequiredMaxSupportedPageSize = 0x4000;
@@ -80,11 +79,6 @@
return android::base::GetBoolProperty(kLowRamProp, false);
}
- static int MaxPageSizeSupported() {
- return android::base::GetIntProperty(kProductMaxPageSizeProp,
- kRequiredMaxSupportedPageSize);
- }
-
static int VendorApiLevel() {
// "ro.vendor.api_level" is added in Android T. Undefined indicates S or below
return android::base::GetIntProperty(kVendorApiLevelProp, __ANDROID_API_S__);
@@ -95,8 +89,6 @@
GTEST_SKIP() << "16kB support is only required on V and later releases.";
} else if (IsLowRamDevice()) {
GTEST_SKIP() << "Low Ram devices only support 4kB page size";
- } else if (MaxPageSizeSupported()) {
- GTEST_SKIP() << "Device opted-out of 16kB page size support";
}
}
};
