commit c27ac0df9bb01e71a83c6a891f2e4ca77d2d65c3
author Dimitry Ivanov <dimitry@google.com> Thu Jun 01 07:22:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 01 07:22:28 2017 +0000
tree f089fc9dd699dd1ee9e8f9ca9a959df9a3130863
parent fe4edf65dd78494ea65d5a47c4a747e7a4a2ea73
parent 1e55a0420e910cf3f6b92b7ba7dfa392940898f7

Merge "Make dl_iterate_phdr return correct name for first entry" am: 533cf06474
am: 1e55a0420e

Change-Id: I80c1b5f9169c5d7ae7e139d52643fce981c2f7a3

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 8e7a141..201e187 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1776,6 +1776,9 @@
         if (local_unload_list.contains(child)) {
           continue;
         } else if (child->is_linked() && child->get_local_group_root() != root) {
+          child->get_parents().remove_if([&] (const soinfo* parent) {
+            return parent == si;
+          });
           external_unload_list.push_back(child);
         } else if (child->get_parents().empty()) {
           unload_list.push_back(child);