Merge "Check if public namespace has already been initialized"
am: 0756fae4f1
* commit '0756fae4f1aea5072ed820087b2487b408194c38':
Check if public namespace has already been initialized
Change-Id: Ia338baa984c3ca310f4a30db1d094704607e5cc9
diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index a2cbe19..dca316c 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -117,6 +117,13 @@
}
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";