| commit | b2b14fd7d672b48f3d9887c47c9d3194a8b46c16 | [log] [tgz] |
|---|---|---|
| author | Kalesh Singh <[email protected]> | Thu Apr 18 17:49:52 2024 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Thu Apr 18 17:49:52 2024 +0000 |
| tree | 2303dafc6b0d8a6ac0738560eb70a6d6f361fa5c | |
| parent | be38589fbc500b0c4938562516dca90c370421ef [diff] | |
| parent | 27e74992c2537f6a099144521222f4974a733cd5 [diff] |
VTS: Elf alignment test: Ignore VNDK apexes am: 2d6281a3d0 am: 27e74992c2 Original change: https://android-review.googlesource.com/c/platform/system/memory/libmeminfo/+/3046918 Change-Id: I49e7e0bbc6a37f0562bca207521bedfaa569629a Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/libelf64/tests/page_size_16kb/elf_alignment_test.cpp b/libelf64/tests/page_size_16kb/elf_alignment_test.cpp index dfcab4e..88c39e4 100644 --- a/libelf64/tests/page_size_16kb/elf_alignment_test.cpp +++ b/libelf64/tests/page_size_16kb/elf_alignment_test.cpp
@@ -61,6 +61,11 @@ class ElfAlignmentTest :public ::testing::TestWithParam<std::string> { protected: static void LoadAlignmentCb(const android::elf64::Elf64Binary& elf) { + // Ignore VNDK APEXes. They are prebuilts from old branches, and would + // only be used on devices with old vendor images. + if (elf.path.find("/apex/com.android.vndk.v") == 0) { + return; + } for (int i = 0; i < elf.phdrs.size(); i++) { Elf64_Phdr phdr = elf.phdrs[i];