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

Merge "Set search path to ro.vndk.version property"

Browse source
This commit is contained in:
Treehugger Robot 2017-10-24 01:17:00 +00:00 committed by Gerrit Code Review
commit 8ab16c5da6
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
linker/linker_config.cpp
View file

@ -43,6 +43,9 @@
#include <string>
#include <unordered_map>
#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
#include <sys/_system_properties.h>
class ConfigParser {
public:
enum {
@ -275,6 +278,15 @@ static bool parse_config_file(const char* ld_config_file_path,
return true;
}
static std::string getVndkVersionString() {
char vndk_version_str[1 + PROP_VALUE_MAX] = {};
__system_property_get("ro.vndk.version", vndk_version_str + 1);
if (strlen(vndk_version_str + 1) != 0 && strcmp(vndk_version_str + 1, "current") != 0) {
vndk_version_str[0] = '-';
}
return vndk_version_str;
}
static Config g_config;
static constexpr const char* kDefaultConfigName = "default";
@ -334,6 +346,9 @@ class Properties {
params.push_back({ "SDK_VER", buf });
}
static std::string vndk = getVndkVersionString();
params.push_back({ "VNDK_VER", vndk });
for (auto&& path : paths) {
format_string(&path, params);
}