commit d165d458b69d0e3302b544b73d56ed2afa8ccd96
author Elliott Hughes <enh@google.com> Fri May 26 18:10:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 26 18:10:47 2017 +0000
tree 27f7994d5248fcc4f7d0e676c226725147472efa
parent 1ac92e24b88854bbacdd097226bc8f02d3da2ce2
parent d0b030eb9cce690f92b7d0c39fb06c0a717e359d

Merge "Enable exporting the non-uapi scsi headers." am: 6be65c135b
am: d0b030eb9c

Change-Id: I90f87bfd05e8be59ad507f3466b8f78c0e885656

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