commit 1ac92e24b88854bbacdd097226bc8f02d3da2ce2
author Christopher Ferris <cferris@google.com> Fri May 26 17:05:11 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 26 17:05:11 2017 +0000
tree 3f66156407ed749679ddd88e0dbb6332fd3a21b5
parent e1c7a94d8bcad5476a50b078c38aed68dc4547e4
parent c4d31c981a745f1f343b225b2be04223a5badd4c

Merge "Add offset to backtrace_string printing." am: f6a5afcb62
am: c4d31c981a

Change-Id: Iab1201771f12ce3e59954a88d2a897ba68f74984

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