commit 734a59577edd7862465dafd24e86e20bf833b031
author Christopher Ferris <cferris@google.com> Fri Jun 02 22:12:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 02 22:12:12 2017 +0000
tree 91ff7f0a68496207723328905a5b2cd1b0d16fa4
parent 0c12408773cd8de02ff37716b8cb94a4300d36b3
parent 0b65dc85acb1d62176c5584a7243e68aebf648f0

Merge "Use libdemangle for function names." am: 5c76fec282
am: 0b65dc85ac

Change-Id: I78957fcc07495269d5d6ac924c7cde64f5edb8c8

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