commit 0c12408773cd8de02ff37716b8cb94a4300d36b3
author Elliott Hughes <enh@google.com> Thu Jun 01 23:41:09 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 01 23:41:09 2017 +0000
tree 0f14689a3c19b270cee0a6ebf2aedecf4c01556b
parent 85fb061c244207822aaae90f68e6f72b57571478
parent 799a5c412116801c67941fbc8d7010f6baf5da5e

Merge "Fix boost build with unified headers." am: 498b4de964
am: 799a5c4121

Change-Id: I3e13ef7804daa5d15aa3f51ef9402fe48cccdec4

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