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

Merge "Set parent namespace for linker-namespaces"

Browse source 
am: ac50d0cc57

* commit 'ac50d0cc5789d8462fcd2d9f6cb225e0edf9a12f':
  Set parent namespace for linker-namespaces

Change-Id: I832b3f228873e93a8b9a00e365af561f10b41eb2
This commit is contained in:
Dimitry Ivanov 2016-05-17 22:58:45 +00:00 • committed by android-build-merger
commit 3457aba394
2 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libnativeloader/dlext_namespaces.h
View file

@ -83,7 +83,8 @@ extern struct android_namespace_t* android_create_namespace(const char* name,
const char* ld_library_path, const char* ld_library_path,
const char* default_library_path, const char* default_library_path,
uint64_t type, uint64_t type,
const char* permitted_when_isolated_path); const char* permitted_when_isolated_path,
android_namespace_t* parent);
__END_DECLS __END_DECLS

28
libnativeloader/native_loader.cpp
View file

@ -95,11 +95,14 @@ class LibraryNamespaces {
namespace_type |= ANDROID_NAMESPACE_TYPE_SHARED; namespace_type |= ANDROID_NAMESPACE_TYPE_SHARED;
} }
android_namespace_t* parent_ns = FindParentNamespaceByClassLoader(env, class_loader);
ns = android_create_namespace("classloader-namespace", ns = android_create_namespace("classloader-namespace",
nullptr, nullptr,
library_path.c_str(), library_path.c_str(),
namespace_type, namespace_type,
permitted_path.c_str()); permitted_path.c_str(),
parent_ns);
if (ns != nullptr) { if (ns != nullptr) {
namespaces_.push_back(std::make_pair(env->NewWeakGlobalRef(class_loader), ns)); namespaces_.push_back(std::make_pair(env->NewWeakGlobalRef(class_loader), ns));
@ -200,6 +203,29 @@ class LibraryNamespaces {
return initialized_; return initialized_;
} }
jobject GetParentClassLoader(JNIEnv* env, jobject class_loader) {
jclass class_loader_class = env->FindClass("java/lang/ClassLoader");
jmethodID get_parent = env->GetMethodID(class_loader_class,
"getParent",
"()Ljava/lang/ClassLoader;");
return env->CallObjectMethod(class_loader, get_parent);
}
android_namespace_t* FindParentNamespaceByClassLoader(JNIEnv* env, jobject class_loader) {
jobject parent_class_loader = GetParentClassLoader(env, class_loader);
while (parent_class_loader != nullptr) {
android_namespace_t* ns = FindNamespaceByClassLoader(env, parent_class_loader);
if (ns != nullptr) {
return ns;
}
parent_class_loader = GetParentClassLoader(env, parent_class_loader);
}
return nullptr;
}
bool initialized_; bool initialized_;
std::vector<std::pair<jweak, android_namespace_t*>> namespaces_; std::vector<std::pair<jweak, android_namespace_t*>> namespaces_;
std::string public_libraries_; std::string public_libraries_;