Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 581beebc authored by Dimitry Ivanov's avatar Dimitry Ivanov Committed by Gerrit Code Review
Browse files

Merge "Enable namespaces for all target sdk versions"

parents bf1767fb 213676b8

libnativeloader/native_loader.cpp

+3 −9
Original line number Diff line number Diff line
@@ -159,10 +159,6 @@ class LibraryNamespaces { 


static std::mutex g_namespaces_mutex;

static LibraryNamespaces* g_namespaces = new LibraryNamespaces;



static bool namespaces_enabled(uint32_t target_sdk_version) {

  return target_sdk_version > 0;

}

#endif



void InitializeNativeLoader() {
@@ -180,10 +176,7 @@ jstring CreateClassLoaderNamespace(JNIEnv* env, 
                                   jstring library_path,

                                   jstring permitted_path) {

#if defined(__ANDROID__)

  if (!namespaces_enabled(target_sdk_version)) {

    return nullptr;

  }



  UNUSED(target_sdk_version);

  std::lock_guard<std::mutex> guard(g_namespaces_mutex);

  android_namespace_t* ns = g_namespaces->Create(env,

                                                 class_loader,
@@ -206,7 +199,8 @@ void* OpenNativeLibrary(JNIEnv* env, 
                        jobject class_loader,

                        jstring library_path) {

#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);

  }