diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2016-05-11 01:30:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-11 01:30:32 +0000 |
| commit | ddc6a4a0a6d5ee2faab9021ff302142033b16842 (patch) | |
| tree | 03e89cdb5b83cee8ba261ac4956ce819f9e5ebf6 /libnativeloader/native_loader.cpp | |
| parent | 8f79183a11200edcc73dc39fdfdf691892094fe5 (diff) | |
| parent | 5cd1e6822abd016e5ee6e642528b39acaf15ae55 (diff) | |
| download | system_core-ddc6a4a0a6d5ee2faab9021ff302142033b16842.tar.gz system_core-ddc6a4a0a6d5ee2faab9021ff302142033b16842.tar.bz2 system_core-ddc6a4a0a6d5ee2faab9021ff302142033b16842.zip | |
Merge "Check if public namespace has already been initialized" am: 0756fae4f1
am: 5cd1e6822a
* commit '5cd1e6822abd016e5ee6e642528b39acaf15ae55':
Check if public namespace has already been initialized
Change-Id: I13740764783765256af2fb1672fbfc5592147760
Diffstat (limited to 'libnativeloader/native_loader.cpp')
| -rw-r--r-- | libnativeloader/native_loader.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp index 0b49b4106..cf8a08952 100644 --- a/libnativeloader/native_loader.cpp +++ b/libnativeloader/native_loader.cpp @@ -119,6 +119,13 @@ class LibraryNamespaces { } 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; const char* android_root_env = getenv("ANDROID_ROOT"); std::string root_dir = android_root_env != nullptr ? android_root_env : "/system"; |