commit e1c7a94d8bcad5476a50b078c38aed68dc4547e4
author Dimitry Ivanov <dimitry@google.com> Fri May 26 01:41:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 26 01:41:41 2017 +0000
tree 293be2f7a6dab1668389427fe9181d19e3494262
parent fcb452e60276398e23d472fcb0afc4b0c14f4628
parent 82f4098497c29ea22e4290b7ccd6e7dc6ee1edf5

Merge "Relax flaky _SC_AVPHYS_PAGES check in sys_sysinfo_test" am: 232681160a
am: 82f4098497

Change-Id: I02cf9d73a15e93f109639edb13a4048bd91101d2

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