commit 8e89000b44a034668a5310338b795d4cf03c73d2
author Dimitry Ivanov <dimitry@google.com> Wed Apr 19 11:28:16 2017 -0700
committer JP Sugarbroad <jpsugar@google.com> Fri May 19 00:25:04 2017 -0700
tree ae33e49fbcdddb79e9ad8b950d5874eef1cc77de
parent f961c5a2f9519a320c1b784ca7e59592b4c58191

linker: remove link from external library on unload

When unloading library make sure the soinfo_link to parent
from linked external libraries is removed as well.

Bug: 36104177
Bug: http://b/37433850
Test: manual
Change-Id: I601b54144acecac54744805b38313c46045c54cb
(cherry picked from commit ee398f820700de30941fd82e38bd917e1513cbc6)
(cherry picked from commit b37d10cc8017c102530c096537890b7c6215ad2b)

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