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

Merge "Avoid runtime namespace becoming parent for classloader-namespace."

Browse source
This commit is contained in:
Martin Stjernholm 2019-02-24 20:30:03 +00:00 • committed by Gerrit Code Review
commit d39f262aad
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libnativeloader/native_loader.cpp
View file

@ -115,6 +115,8 @@ static constexpr const char* kVendorNamespaceName = "sphal";
static constexpr const char* kVndkNamespaceName = "vndk"; static constexpr const char* kVndkNamespaceName = "vndk";
static constexpr const char* kDefaultNamespaceName = "default";
static constexpr const char* kPlatformNamespaceName = "platform";
static constexpr const char* kRuntimeNamespaceName = "runtime"; static constexpr const char* kRuntimeNamespaceName = "runtime";
// classloader-namespace is a linker namespace that is created for the loaded // classloader-namespace is a linker namespace that is created for the loaded
@ -272,8 +274,19 @@ class LibraryNamespaces {
NativeLoaderNamespace native_loader_ns; NativeLoaderNamespace native_loader_ns;
if (!is_native_bridge) { if (!is_native_bridge) {
android_namespace_t* android_parent_ns = android_namespace_t* android_parent_ns;
parent_ns == nullptr ? nullptr : parent_ns->get_android_ns(); if (parent_ns != nullptr) {
android_parent_ns = parent_ns->get_android_ns();
} else {
// Fall back to the platform namespace if no parent is found. It is
// called "default" for binaries in /system and "platform" for those in
// the Runtime APEX. Try "platform" first since "default" always exists.
android_parent_ns = android_get_exported_namespace(kPlatformNamespaceName);
if (android_parent_ns == nullptr) {
android_parent_ns = android_get_exported_namespace(kDefaultNamespaceName);
}
}
android_namespace_t* ns = android_create_namespace(namespace_name, android_namespace_t* ns = android_create_namespace(namespace_name,
nullptr, nullptr,
library_path.c_str(), library_path.c_str(),
@ -322,8 +335,16 @@ class LibraryNamespaces {
native_loader_ns = NativeLoaderNamespace(ns); native_loader_ns = NativeLoaderNamespace(ns);
} else { } else {
native_bridge_namespace_t* native_bridge_parent_namespace = native_bridge_namespace_t* native_bridge_parent_namespace;
parent_ns == nullptr ? nullptr : parent_ns->get_native_bridge_ns(); if (parent_ns != nullptr) {
native_bridge_parent_namespace = parent_ns->get_native_bridge_ns();
} else {
native_bridge_parent_namespace = NativeBridgeGetExportedNamespace(kPlatformNamespaceName);
if (native_bridge_parent_namespace == nullptr) {
native_bridge_parent_namespace = NativeBridgeGetExportedNamespace(kDefaultNamespaceName);
}
}
native_bridge_namespace_t* ns = NativeBridgeCreateNamespace(namespace_name, native_bridge_namespace_t* ns = NativeBridgeCreateNamespace(namespace_name,
nullptr, nullptr,
library_path.c_str(), library_path.c_str(),