commit 85fb061c244207822aaae90f68e6f72b57571478
author Goran Ferenc <goran.ferenc@imgtec.com> Thu Jun 01 17:56:43 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 01 17:56:43 2017 +0000
tree 2e37e7d6061ac9a37410f98ad2edf0dea351f4fd
parent c27ac0df9bb01e71a83c6a891f2e4ca77d2d65c3
parent d32465b2554d36c5370c398a2d56e83e6e20d79d

Merge "MIPS: 32/64-bit VDSO support" am: 72c8fce6c9
am: d32465b255

Change-Id: I9679f0f032d463fbde8996a9174938476f10d276

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