diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2017-10-24 06:52:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-24 06:52:25 +0000 |
| commit | 640fda69bf510878677aa84d6e4246cf48fd1c0c (patch) | |
| tree | 5911601885ce84c9366700b77ea9acec5feb7dc1 /linker/linker.cpp | |
| parent | b0b34d51351d1fe1c8789609d679529fa834aa41 (diff) | |
| parent | 0b1c8be3be5983e5ae3dfe4aa864675298b5455b (diff) | |
Merge "linker: fix error message for inaccessible libs"
am: 0b1c8be3be
Change-Id: I1dc1c1ec8aa104f6b2efd9c6ce5c2188398a7161
Diffstat (limited to 'linker/linker.cpp')
| -rw-r--r-- | linker/linker.cpp | 2 |
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)) { |