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

Commit 2c3cdae2 authored by Dimitry Ivanov's avatar Dimitry Ivanov Committed by android-build-merger
Browse files

Enable namespaces for all target sdk versions 

am: 5539db0b

* commit '5539db0b':
  Enable namespaces for all target sdk versions

Change-Id: I29fda91a146b15f3356f9d50638b09a573c43e3a
parents d7f60557 5539db0b

libnativeloader/native_loader.cpp

+3 −9
Original line number Diff line number Diff line
@@ -172,10 +172,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() {
@@ -193,10 +189,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,
@@ -220,7 +213,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);

  }