summaryrefslogtreecommitdiff
path: root/linker/linker.cpp
diff options
context:
space:
mode:
authorDimitry Ivanov <dimitry@google.com>2017-10-24 06:44:19 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-10-24 06:44:19 +0000
commit0b1c8be3be5983e5ae3dfe4aa864675298b5455b (patch)
tree5911601885ce84c9366700b77ea9acec5feb7dc1 /linker/linker.cpp
parent8ab16c5da682c0ef86144390bada5d394dbb73a4 (diff)
parent8db36a51ff66c6849d355d8cb65142c0dcf7e1bc (diff)
Merge "linker: fix error message for inaccessible libs"
Diffstat (limited to 'linker/linker.cpp')
-rw-r--r--linker/linker.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp
index ec92c9205..5f906c87a 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1433,6 +1433,8 @@ static bool find_library_internal(android_namespace_t* ns,
if (search_linked_namespaces) {
// if a library was not found - look into linked namespaces
+ // preserve current dlerror in the case it fails.
+ DlErrorRestorer dlerror_restorer;
for (auto& linked_namespace : ns->linked_namespaces()) {
if (find_library_in_linked_namespace(linked_namespace,
task)) {