commit fe4edf65dd78494ea65d5a47c4a747e7a4a2ea73
author Christopher Ferris <cferris@google.com> Wed May 31 20:25:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 31 20:25:57 2017 +0000
tree c6da1a6e19d1710c2f3b629f98d77297e123766c
parent 5e465f76443fe804418e335c124d274dd479079d
parent c613ed2ab2161ad680782e81e433f6d8c048674f

Merge "Move mallopt to correct section." am: 15eaaddef9
am: c613ed2ab2

Change-Id: I36ed519b1a3d42d97f2960622195584f0273d024

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