diff options
| author | Pete Bentley <prb@google.com> | 2018-12-19 13:33:33 +0000 |
|---|---|---|
| committer | Pete Bentley <prb@google.com> | 2018-12-19 13:48:01 +0000 |
| commit | 632f142c4219a6b8300e5d7df180ce9eca774a44 (patch) | |
| tree | e7b844014eaeea90f26ea9fb8a912bb4f2d33457 /libnativeloader/native_loader.cpp | |
| parent | 8fd4435d532846b46fe47e52a6825a050d1af13c (diff) | |
Propagate dlopen errors to callers of OpenNativeLibrary.
Bug: 119867084
Test: make && flashall
Change-Id: If98082db39796f0097ce7ef1d095c9f202c3a95e
Diffstat (limited to 'libnativeloader/native_loader.cpp')
| -rw-r--r-- | libnativeloader/native_loader.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp index b3e2b97fe..de7ea0885 100644 --- a/libnativeloader/native_loader.cpp +++ b/libnativeloader/native_loader.cpp @@ -639,7 +639,11 @@ void* OpenNativeLibrary(JNIEnv* env, UNUSED(target_sdk_version); if (class_loader == nullptr) { *needs_native_bridge = false; - return dlopen(path, RTLD_NOW); + void* handle = dlopen(path, RTLD_NOW); + if (handle == nullptr) { + *error_msg = dlerror(); + } + return handle; } std::lock_guard<std::mutex> guard(g_namespaces_mutex); |