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

Merge "Use {llndk,vndksp}.libraries.txt from VNDK APEX"

Browse source
This commit is contained in:
Treehugger Robot 2020-02-27 04:55:53 +00:00 committed by Gerrit Code Review
commit 4d89476be3
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libs/graphicsenv/GraphicsEnv.cpp
View file

@ -76,26 +76,25 @@ enum NativeLibrary {
VNDKSP = 1,
};
static constexpr const char* kNativeLibrariesSystemConfigPath[] = {"/etc/llndk.libraries.txt",
"/etc/vndksp.libraries.txt"};
static constexpr const char* kNativeLibrariesSystemConfigPath[] =
{"/apex/com.android.vndk.v{}/etc/llndk.libraries.{}.txt",
"/apex/com.android.vndk.v{}/etc/vndksp.libraries.{}.txt"};
static std::string vndkVersionStr() {
#ifdef __BIONIC__
std::string version = android::base::GetProperty("ro.vndk.version", "");
if (version != "" && version != "current") {
return "." + version;
}
return android::base::GetProperty("ro.vndk.version", "");
#endif
return "";
}
static void insertVndkVersionStr(std::string* fileName) {
LOG_ALWAYS_FATAL_IF(!fileName, "fileName should never be nullptr");
size_t insertPos = fileName->find_last_of(".");
if (insertPos == std::string::npos) {
insertPos = fileName->length();
std::string version = vndkVersionStr();
size_t pos = fileName->find("{}");
while (pos != std::string::npos) {
fileName->replace(pos, 2, version);
pos = fileName->find("{}", pos + version.size());
}
fileName->insert(insertPos, vndkVersionStr());
}
static bool readConfig(const std::string& configFile, std::vector<std::string>* soNames) {
@ -118,11 +117,7 @@ static bool readConfig(const std::string& configFile, std::vector<std::string>*
}
static const std::string getSystemNativeLibraries(NativeLibrary type) {
static const char* androidRootEnv = getenv("ANDROID_ROOT");
static const std::string rootDir = androidRootEnv != nullptr ? androidRootEnv : "/system";
std::string nativeLibrariesSystemConfig = rootDir + kNativeLibrariesSystemConfigPath[type];
std::string nativeLibrariesSystemConfig = kNativeLibrariesSystemConfigPath[type];
insertVndkVersionStr(&nativeLibrariesSystemConfig);
std::vector<std::string> soNames;