ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve merge conflicts of 663c998 to nyc-dev-plus-aosp

Browse source 
Change-Id: I73530375b015a7701acda1c6e0ddb5b4ca6a032c
This commit is contained in:
Dimitry Ivanov 2016-04-11 13:18:35 -07:00
commit 03890daa4e
1 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
libnativeloader/native_loader.cpp
View file

@ -37,7 +37,8 @@
namespace android {
#if defined(__ANDROID__)
static constexpr const char* kPublicNativeLibrariesConfig = "/system/etc/public.libraries.txt";
static constexpr const char* kPublicNativeLibrariesSystemConfig = "/system/etc/public.libraries.txt";
static constexpr const char* kPublicNativeLibrariesVendorConfig = "/vendor/etc/public.libraries.txt";
static bool namespace_workaround_enabled(int32_t target_sdk_version) {
return target_sdk_version <= 23;
@ -107,35 +108,51 @@ class LibraryNamespaces {
}
void Initialize() {
std::vector<std::string> sonames;
LOG_ALWAYS_FATAL_IF(!ReadConfig(kPublicNativeLibrariesSystemConfig, &sonames),
"Error reading public native library list from \"%s\": %s",
kPublicNativeLibrariesSystemConfig, strerror(errno));
// This file is optional, quietly ignore if the file does not exist.
ReadConfig(kPublicNativeLibrariesVendorConfig, &sonames);
// android_init_namespaces() expects all the public libraries
// to be loaded so that they can be found by soname alone.
//
// TODO(dimitry): this is a bit misleading since we do not know
// if the vendor public library is going to be opened from /vendor/lib
// we might as well end up loading them from /system/lib
// For now we rely on CTS test to catch things like this but
// it should probably be addressed in the future.
for (const auto& soname : sonames) {
dlopen(soname.c_str(), RTLD_NOW | RTLD_NODELETE);
}
public_libraries_ = base::Join(sonames, ':');
}
private:
bool ReadConfig(const std::string& configFile, std::vector<std::string>* sonames) {
// Read list of public native libraries from the config file.
std::string file_content;
LOG_ALWAYS_FATAL_IF(!base::ReadFileToString(kPublicNativeLibrariesConfig, &file_content),
"Error reading public native library list from \"%s\": %s",
kPublicNativeLibrariesConfig, strerror(errno));
if(!base::ReadFileToString(configFile, &file_content)) {
return false;
}
std::vector<std::string> lines = base::Split(file_content, "\n");
std::vector<std::string> sonames;
for (const auto& line : lines) {
auto trimmed_line = base::Trim(line);
if (trimmed_line[0] == '#' || trimmed_line.empty()) {
continue;
}
sonames.push_back(trimmed_line);
sonames->push_back(trimmed_line);
}
public_libraries_ = base::Join(sonames, ':');
// android_init_namespaces() expects all the public libraries
// to be loaded so that they can be found by soname alone.
for (const auto& soname : sonames) {
dlopen(soname.c_str(), RTLD_NOW | RTLD_NODELETE);
}
return true;
}
private:
bool InitPublicNamespace(const char* library_path, int32_t target_sdk_version) {
std::string publicNativeLibraries = public_libraries_;