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

Merge "Add support to indicate bitness of public library." into nyc-mr1-dev

Browse source
This commit is contained in:
Christopher Ferris 2016-06-22 17:56:50 +00:00 • committed by Android (Google) Code Review
commit 3394cd7c3c
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
libnativeloader/native_loader.cpp
View file

@ -127,9 +127,10 @@ class LibraryNamespaces {
std::string public_native_libraries_system_config = std::string public_native_libraries_system_config =
root_dir + kPublicNativeLibrariesSystemConfigPathFromRoot; root_dir + kPublicNativeLibrariesSystemConfigPathFromRoot;
LOG_ALWAYS_FATAL_IF(!ReadConfig(public_native_libraries_system_config, &sonames), std::string error_msg;
LOG_ALWAYS_FATAL_IF(!ReadConfig(public_native_libraries_system_config, &sonames, &error_msg),
"Error reading public native library list from \"%s\": %s", "Error reading public native library list from \"%s\": %s",
public_native_libraries_system_config.c_str(), strerror(errno)); public_native_libraries_system_config.c_str(), error_msg.c_str());
// For debuggable platform builds use ANDROID_ADDITIONAL_PUBLIC_LIBRARIES environment // For debuggable platform builds use ANDROID_ADDITIONAL_PUBLIC_LIBRARIES environment
// variable to add libraries to the list. This is intended for platform tests only. // variable to add libraries to the list. This is intended for platform tests only.
@ -166,20 +167,42 @@ class LibraryNamespaces {
} }
private: private:
bool ReadConfig(const std::string& configFile, std::vector<std::string>* sonames) { bool ReadConfig(const std::string& configFile, std::vector<std::string>* sonames,
std::string* error_msg = nullptr) {
// Read list of public native libraries from the config file. // Read list of public native libraries from the config file.
std::string file_content; std::string file_content;
if(!base::ReadFileToString(configFile, &file_content)) { if(!base::ReadFileToString(configFile, &file_content)) {
if (error_msg) *error_msg = strerror(errno);
return false; return false;
} }
std::vector<std::string> lines = base::Split(file_content, "\n"); std::vector<std::string> lines = base::Split(file_content, "\n");
for (const auto& line : lines) { for (auto& line : lines) {
auto trimmed_line = base::Trim(line); auto trimmed_line = base::Trim(line);
if (trimmed_line[0] == '#' || trimmed_line.empty()) { if (trimmed_line[0] == '#' || trimmed_line.empty()) {
continue; continue;
} }
size_t space_pos = trimmed_line.rfind(' ');
if (space_pos != std::string::npos) {
std::string type = trimmed_line.substr(space_pos + 1);
if (type != "32" && type != "64") {
if (error_msg) *error_msg = "Malformed line: " + line;
return false;
}
#if defined(__LP64__)
// Skip 32 bit public library.
if (type == "32") {
continue;
}
#else
// Skip 64 bit public library.
if (type == "64") {
continue;
}
#endif
trimmed_line.resize(space_pos);
}
sonames->push_back(trimmed_line); sonames->push_back(trimmed_line);
} }