Martchus
/
arch-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Consider libs under `…/lib/linux/…` Android-specific as well

This commit is contained in:
Martchus 2023-02-18 20:29:44 +01:00
parent e477613a8b
commit 2e448b427b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libpkg/parser/binary.cpp
View File

@ -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-";