commit a59d2149cde9a96a255219b290201ea5293d1eef
author Pete Bentley <prb@google.com> Wed Dec 19 13:33:33 2018 +0000
committer Pete Bentley <prb@google.com> Wed Dec 19 13:48:01 2018 +0000
tree e7b844014eaeea90f26ea9fb8a912bb4f2d33457
parent 3df93aa455f24e6ed824a15c485b116842578192

Propagate dlopen errors to callers of OpenNativeLibrary.

Bug: 119867084
Test: make && flashall
Change-Id: If98082db39796f0097ce7ef1d095c9f202c3a95e

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);