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

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

Merge "Set parent namespace for linker-namespaces" am: ac50d0cc 

am: 3457aba3

* commit '3457aba3':
  Set parent namespace for linker-namespaces

Change-Id: I20ea9239e95377894f477c33cf65bc7da7ad1e5a
parents 666d9aa5 3457aba3

libnativeloader/dlext_namespaces.h

+2 −1
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ extern struct android_namespace_t* android_create_namespace(const char* name, 
                                                            const char* ld_library_path,

                                                            const char* default_library_path,

                                                            uint64_t type,

                                                            const char* permitted_when_isolated_path);

                                                            const char* permitted_when_isolated_path,

                                                            android_namespace_t* parent);



__END_DECLS

libnativeloader/native_loader.cpp

+27 −1
Original line number Diff line number Diff line
@@ -97,11 +97,14 @@ class LibraryNamespaces { 
      namespace_type |= ANDROID_NAMESPACE_TYPE_SHARED;

    }



    android_namespace_t* parent_ns = FindParentNamespaceByClassLoader(env, class_loader);



    ns = android_create_namespace("classloader-namespace",

                                  nullptr,

                                  library_path.c_str(),

                                  namespace_type,

                                  permitted_path.c_str());

                                  permitted_path.c_str(),

                                  parent_ns);



    if (ns != nullptr) {

      namespaces_.push_back(std::make_pair(env->NewWeakGlobalRef(class_loader), ns));
@@ -205,6 +208,29 @@ class LibraryNamespaces { 
    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_;

  std::vector<std::pair<jweak, android_namespace_t*>> namespaces_;

  std::string public_libraries_;