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

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

Merge "nativeloader: Add CloseNativeLibrary() method" into nyc-dev 

am: acd3c717

* commit 'acd3c717':
  nativeloader: Add CloseNativeLibrary() method

Change-Id: I109d4fd3b688720c5260a2b40641e25122085a5f
parents f6ff9638 acd3c717

libnativeloader/include/nativeloader/native_loader.h

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

                        jstring library_path);



__attribute__((visibility("default")))

bool CloseNativeLibrary(void* handle);



#if defined(__ANDROID__)

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

// there is no namespace associated with the class_loader.

libnativeloader/native_loader.cpp

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

}



bool CloseNativeLibrary(void* handle) {

  return dlclose(handle) == 0;

}



#if defined(__ANDROID__)

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

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