commit ec5ddc0a2334aaf7a36cbf99deb668e13e5cd717
author Dimitry Ivanov <dimitry@google.com> Wed May 17 11:46:54 2017 -0700
committer Dimitry Ivanov <dimitry@google.com> Thu May 18 01:02:54 2017 +0000
tree f1e621d60d61e4ec548e596d840646181884ca3f
parent bb67386c850c00e4c9081c61fa88e7554e3e779f

Revert "linker: remove link from external library on unload"

This reverts commit b37d10cc8017c102530c096537890b7c6215ad2b.

Was merged from nyc-dev to master and oc-dev by mistake.

Bug: http://b/38384727
Test: bionic-unit-tests
Change-Id: I7cd352baceb3180342abb6ffec1dfa96a217961f

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 9a6543c..c661624 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1775,9 +1775,6 @@
         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);