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

Merge "Enable namespaces for all target sdk versions"

Browse source 
am: 581beeb

* commit '581beebc98e9f420db30e7ff031302fea8ce4af2':
  Enable namespaces for all target sdk versions

Change-Id: I7b0c37717942d0d743e9f877bfba0a29ac0d9c7c
This commit is contained in:
Dimitry Ivanov 2016-04-27 18:41:57 +00:00 • committed by android-build-merger
commit ced603d5da
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libnativeloader/native_loader.cpp
View file

@ -159,10 +159,6 @@ class LibraryNamespaces {
static std::mutex g_namespaces_mutex; static std::mutex g_namespaces_mutex;
static LibraryNamespaces* g_namespaces = new LibraryNamespaces; static LibraryNamespaces* g_namespaces = new LibraryNamespaces;
static bool namespaces_enabled(uint32_t target_sdk_version) {
return target_sdk_version > 0;
}
#endif #endif
void InitializeNativeLoader() { void InitializeNativeLoader() {
@ -180,10 +176,7 @@ jstring CreateClassLoaderNamespace(JNIEnv* env,
jstring library_path, jstring library_path,
jstring permitted_path) { jstring permitted_path) {
#if defined(__ANDROID__) #if defined(__ANDROID__)
if (!namespaces_enabled(target_sdk_version)) { UNUSED(target_sdk_version);
return nullptr;
}
std::lock_guard<std::mutex> guard(g_namespaces_mutex); std::lock_guard<std::mutex> guard(g_namespaces_mutex);
android_namespace_t* ns = g_namespaces->Create(env, android_namespace_t* ns = g_namespaces->Create(env,
class_loader, class_loader,
@ -206,7 +199,8 @@ void* OpenNativeLibrary(JNIEnv* env,
jobject class_loader, jobject class_loader,
jstring library_path) { jstring library_path) {
#if defined(__ANDROID__) #if defined(__ANDROID__)
if (!namespaces_enabled(target_sdk_version) || class_loader == nullptr) { UNUSED(target_sdk_version);
if (class_loader == nullptr) {
return dlopen(path, RTLD_NOW); return dlopen(path, RTLD_NOW);
} }