From 2e448b427b685b4828f72e6edfa74ca25b8f422d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 18 Feb 2023 20:29:44 +0100 Subject: [PATCH] =?UTF-8?q?Consider=20libs=20under=20`=E2=80=A6/lib/linux/?= =?UTF-8?q?=E2=80=A6`=20Android-specific=20as=20well?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libpkg/parser/binary.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libpkg/parser/binary.cpp b/libpkg/parser/binary.cpp index b1d9b90..030bf45 100644 --- a/libpkg/parser/binary.cpp +++ b/libpkg/parser/binary.cpp @@ -219,7 +219,8 @@ void Binary::load(std::string_view fileContent, std::string_view fileName, std:: // add prefix to Android and compat libs to avoid confusion with normal GNU/Linux ELFs // note: Relying on the path is not nice. Have Android libs any special header to be distinguishable? if (directoryPath.starts_with("opt/android-libs") - || (directoryPath.starts_with("opt/android-ndk") && directoryPath.find("/sysroot/") != std::string::npos)) { + || (directoryPath.starts_with("opt/android-ndk") && (directoryPath.find("/sysroot/") != std::string::npos + || directoryPath.find("/lib/linux/") != std::string::npos))) { extraPrefix = "android-"; } else if (directoryPath.starts_with("usr/static-compat/lib") && fileName.find(".so") != std::string::npos) { extraPrefix = "static-compat-";