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

Commit 51c38147 authored by Dimitry Ivanov's avatar Dimitry Ivanov Committed by Gerrit Code Review
Browse files

Merge changes Ib80dcce9,Ifef3de75 

* changes:
  nativeloader: Export FindNamespaceByClassLoader
  nativeloader: refactor FindNamespaceByClassLoader method
parents 806bb17e 0cd10d83

libnativeloader/include/nativeloader/native_loader.h

+10 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 


#include "jni.h"

#include <stdint.h>

#if defined(__ANDROID__)

#include <android/dlext.h>

#endif



namespace android {
@@ -27,6 +30,13 @@ void* OpenNativeLibrary(JNIEnv* env, int32_t target_sdk_version, const char* pat 
                        jobject class_loader, bool is_shared, jstring library_path,

                        jstring permitted_path);



#if defined(__ANDROID__)

// Look up linker namespace by class_loader. Returns nullptr if

// there is no namespace associated with the class_loader.

__attribute__((visibility("default")))

android_namespace_t* FindNamespaceByClassLoader(JNIEnv* env, jobject class_loader);

#endif



};  // namespace android



#endif  // NATIVE_BRIDGE_H_

libnativeloader/native_loader.cpp

+24 −19
Original line number Diff line number Diff line
@@ -79,10 +79,10 @@ class LibraryNamespaces { 


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



    auto it = FindNamespaceByClassLoader(env, class_loader);

    android_namespace_t* ns = FindNamespaceByClassLoader(env, class_loader);



    if (it != namespaces_.end()) {

      return it->second;

    if (ns != nullptr) {

      return ns;

    }



    uint64_t namespace_type = ANDROID_NAMESPACE_TYPE_ISOLATED;
@@ -90,8 +90,7 @@ class LibraryNamespaces { 
      namespace_type |= ANDROID_NAMESPACE_TYPE_SHARED;

    }



    android_namespace_t* ns =

            android_create_namespace("classloader-namespace",

    ns = android_create_namespace("classloader-namespace",

                                  nullptr,

                                  library_path.c_str(),

                                  namespace_type,
@@ -104,6 +103,14 @@ class LibraryNamespaces { 
    return ns;

  }



  android_namespace_t* FindNamespaceByClassLoader(JNIEnv* env, jobject class_loader) {

    auto it = std::find_if(namespaces_.begin(), namespaces_.end(),

                [&](const std::pair<jweak, android_namespace_t*>& value) {

                  return env->IsSameObject(value.first, class_loader);

                });

    return it != namespaces_.end() ? it->second : nullptr;

  }



 private:

  void PreloadPublicLibraries() {

    // android_init_namespaces() expects all the public libraries
@@ -122,14 +129,6 @@ class LibraryNamespaces { 
    return initialized_;

  }



  std::vector<std::pair<jweak, android_namespace_t*>>::const_iterator

  FindNamespaceByClassLoader(JNIEnv* env, jobject class_loader) {

    return std::find_if(namespaces_.begin(), namespaces_.end(),

            [&](const std::pair<jweak, android_namespace_t*>& value) {

              return env->IsSameObject(value.first, class_loader);

            });

  }



  bool initialized_;

  std::mutex mutex_;

  std::vector<std::pair<jweak, android_namespace_t*>> namespaces_;
@@ -169,4 +168,10 @@ void* OpenNativeLibrary(JNIEnv* env, int32_t target_sdk_version, const char* pat 
#endif

}



#if defined(__ANDROID__)

android_namespace_t* FindNamespaceByClassLoader(JNIEnv* env, jobject class_loader) {

  return g_namespaces->FindNamespaceByClassLoader(env, class_loader);

}

#endif



}; //  android namespace