diff options
author | Dimitry Ivanov <dimitry@google.com> | 2016-05-03 14:55:25 -0700 |
---|---|---|
committer | Dimitry Ivanov <dimitry@google.com> | 2016-05-03 14:55:25 -0700 |
commit | 09a516bf161c5cabdaa3a67df5aa7fbac667f5f9 (patch) | |
tree | 5e8fa828d391d0abd233bec62965c671ea3447b1 /libnativeloader | |
parent | 3174bda7ac07465400a4b38b272ebe5126212ba6 (diff) | |
download | system_core-09a516bf161c5cabdaa3a67df5aa7fbac667f5f9.tar.gz system_core-09a516bf161c5cabdaa3a67df5aa7fbac667f5f9.tar.bz2 system_core-09a516bf161c5cabdaa3a67df5aa7fbac667f5f9.zip |
nativeloader: Add CloseNativeLibrary() method
This method is called by art on UnloadNativeLibraries()
Bug: http://b/28406866
Change-Id: Ibccff93c83d6ccd3d0a1c0294a64b09281b4e05e
Diffstat (limited to 'libnativeloader')
-rw-r--r-- | libnativeloader/include/nativeloader/native_loader.h | 3 | ||||
-rw-r--r-- | libnativeloader/native_loader.cpp | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libnativeloader/include/nativeloader/native_loader.h b/libnativeloader/include/nativeloader/native_loader.h index d606a760e..2a6aaec50 100644 --- a/libnativeloader/include/nativeloader/native_loader.h +++ b/libnativeloader/include/nativeloader/native_loader.h @@ -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. diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp index baad197fe..8cf140e03 100644 --- a/libnativeloader/native_loader.cpp +++ b/libnativeloader/native_loader.cpp @@ -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); |