commit cb40eec87c6c4bfd1445184fa03c28f1d50bf670
author Dimitry Ivanov <dimitry@google.com> Tue May 16 22:12:22 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 22:12:22 2017 +0000
tree ae33e49fbcdddb79e9ad8b950d5874eef1cc77de
parent 6be47949d6bbb74dd1404a83dc19f44066219b42
parent 3a644889b24edf5efe53d7b333e24009269601ed

linker: remove link from external library on unload am: b37d10cc80
am: 3a644889b2

Change-Id: I7c022194739391c24a736a3a5deb906433fc5649

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 9dc928e..a043b85 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -2246,6 +2246,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 {
           unload_list.push_front(child);