aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitry Ivanov <dimitry@google.com>2017-05-18 16:22:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-05-18 16:22:21 +0000
commitf80b2bae2f85fc958c06b6fad1dbb536593dbf4f (patch)
treed304fa4fbe8a55cf8668c539a114507eeb0be287
parentf963bc3833951e78558de87e0c8fca589572ccf8 (diff)
parentec5ddc0a2334aaf7a36cbf99deb668e13e5cd717 (diff)
downloadbionic-f80b2bae2f85fc958c06b6fad1dbb536593dbf4f.tar.gz
Merge "Revert "linker: remove link from external library on unload"" into oc-dev
-rw-r--r--linker/linker.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp
index 9a6543c11..c6616241b 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1775,9 +1775,6 @@ 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 if (child->get_parents().empty()) {
unload_list.push_back(child);