tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "linker: remove useless comments." into main am: bab8f345a6 am: c5d0a99496

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3093199

Change-Id: If251b44779446e5f8b560cdd440da0eb91c21349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes 2024-05-17 12:41:57 +00:00 committed by Automerger Merge Worker
commit ed292d8f6d
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
linker/linker_phdr.cpp
View file

@ -298,7 +298,6 @@ bool ElfReader::VerifyElfHeader() {
} }
if (header_.e_shentsize != sizeof(ElfW(Shdr))) { if (header_.e_shentsize != sizeof(ElfW(Shdr))) {
// Fail if app is targeting Android O or above
if (get_application_target_sdk_version() >= 26) { if (get_application_target_sdk_version() >= 26) {
DL_ERR_AND_LOG("\"%s\" has unsupported e_shentsize: 0x%x (expected 0x%zx)", DL_ERR_AND_LOG("\"%s\" has unsupported e_shentsize: 0x%x (expected 0x%zx)",
name_.c_str(), header_.e_shentsize, sizeof(ElfW(Shdr))); name_.c_str(), header_.e_shentsize, sizeof(ElfW(Shdr)));
@ -312,12 +311,10 @@ bool ElfReader::VerifyElfHeader() {
} }
if (header_.e_shstrndx == 0) { if (header_.e_shstrndx == 0) {
// Fail if app is targeting Android O or above
if (get_application_target_sdk_version() >= 26) { if (get_application_target_sdk_version() >= 26) {
DL_ERR_AND_LOG("\"%s\" has invalid e_shstrndx", name_.c_str()); DL_ERR_AND_LOG("\"%s\" has invalid e_shstrndx", name_.c_str());
return false; return false;
} }
DL_WARN_documented_change(26, DL_WARN_documented_change(26,
"invalid-elf-header_section-headers-enforced-for-api-level-26", "invalid-elf-header_section-headers-enforced-for-api-level-26",
"\"%s\" has invalid e_shstrndx", name_.c_str()); "\"%s\" has invalid e_shstrndx", name_.c_str());