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

Add extra prefix to static-compat libs to avoid confusion with normal libs

This commit is contained in:
Martchus 2022-05-01 21:08:02 +02:00
parent 0294bc241e
commit 5699895a37
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libpkg/parser/binary.cpp
View File

@ -216,11 +216,13 @@ void Binary::load(std::string_view fileContent, std::string_view fileName, std::
if (name.empty() && isRegularFile && fileName.ends_with(".so")) {
name = fileName;
}
// add prefix to Android libs to avoid confusion with normal GNU/Linux ELFs
// 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)) {
extraPrefix = "android-";
} else if (directoryPath.starts_with("usr/static-compat/lib") && fileName.find(".so") != std::string::npos) {
extraPrefix = "static-compat-";
}
break;
default:;