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

Commit ad717d65 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "nativeloader: Add CloseNativeLibrary() method"

parents f9f76146 7a1f9518

libnativeloader/include/nativeloader/native_loader.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,9 @@ void* OpenNativeLibrary(JNIEnv* env, 
                        jobject class_loader,

                        jobject class_loader,

                        jstring library_path);

                        jstring library_path);





__attribute__((visibility("default")))

bool CloseNativeLibrary(void* handle);



#if defined(__ANDROID__)

#if defined(__ANDROID__)

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

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

// there is no namespace associated with the class_loader.

// there is no namespace associated with the class_loader.

libnativeloader/native_loader.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -241,6 +241,10 @@ void* OpenNativeLibrary(JNIEnv* env, 
#endif

#endif

}

}





bool CloseNativeLibrary(void* handle) {

  return dlclose(handle) == 0;

}



#if defined(__ANDROID__)

#if defined(__ANDROID__)

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

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

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

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