From 80ddb8f5517b4632307705858c3402081583a456 Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Mon, 9 May 2016 18:12:00 -0700 Subject: [PATCH] Check if public namespace has already been initialized There is no point in reading/loading the list of public libraries once public namespace is already initialized. Change-Id: I5a53c46bb57b8de241ba521a6321c12e94a76476 --- libnativeloader/native_loader.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp index 33d5b62a4..9a24714bd 100644 --- a/libnativeloader/native_loader.cpp +++ b/libnativeloader/native_loader.cpp @@ -105,6 +105,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 sonames; const char* android_root_env = getenv("ANDROID_ROOT"); std::string root_dir = android_root_env != nullptr ? android_root_env : "/system";