diff options
author | Dimitry Ivanov <dimitry@google.com> | 2017-05-16 22:12:22 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-16 22:12:22 +0000 |
commit | cb40eec87c6c4bfd1445184fa03c28f1d50bf670 (patch) | |
tree | ae33e49fbcdddb79e9ad8b950d5874eef1cc77de | |
parent | 6be47949d6bbb74dd1404a83dc19f44066219b42 (diff) | |
parent | 3a644889b24edf5efe53d7b333e24009269601ed (diff) | |
download | bionic-cb40eec87c6c4bfd1445184fa03c28f1d50bf670.tar.gz |
linker: remove link from external library on unload am: b37d10cc80
am: 3a644889b2
Change-Id: I7c022194739391c24a736a3a5deb906433fc5649
-rw-r--r-- | linker/linker.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp index 9dc928eb4..a043b859a 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -2246,6 +2246,9 @@ static void soinfo_unload(soinfo* soinfos[], size_t count) { 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); |