commit 03d896e5595aa82c941591741d40adb98333b8d0
author Pete Bentley <prb@google.com> Wed Dec 19 07:53:18 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 19 07:53:18 2018 -0800
tree e5a59db59b9b46b22bbfd2a2e15f883ee2d0741f
parent 338f9255fc3dbfe842c7d92588ea72707856f2d2
parent 6d881ae014003712e9761551ec1529f288910946

Merge "Propagate dlopen errors to callers of OpenNativeLibrary." am: 613674049f
am: 87cb715dfa

Change-Id: I38d8a494e75e485477e26a6867b6fdbf599fbb02

libnativeloader/native_loader.cpp

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index b3e2b97..de7ea08 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -639,7 +639,11 @@
   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);