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

Merge "Check if public namespace has already been initialized"

Browse source 
am: 0756fae4f1

* commit '0756fae4f1aea5072ed820087b2487b408194c38':
  Check if public namespace has already been initialized

Change-Id: Ia338baa984c3ca310f4a30db1d094704607e5cc9
This commit is contained in:
Dimitry Ivanov 2016-05-11 01:27:55 +00:00 • committed by android-build-merger
commit 5cd1e6822a
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libnativeloader/native_loader.cpp
View file

@ -117,6 +117,13 @@ class LibraryNamespaces {
} }
void Initialize() { void Initialize() {
// Once public namespace is initialized there is no
// point in running this code - it will have no effect
// on the current list of public libraries.
if (initialized_) {
return;
}
std::vector<std::string> sonames; std::vector<std::string> sonames;
const char* android_root_env = getenv("ANDROID_ROOT"); const char* android_root_env = getenv("ANDROID_ROOT");
std::string root_dir = android_root_env != nullptr ? android_root_env : "/system"; std::string root_dir = android_root_env != nullptr ? android_root_env : "/system";