OSDN Git Service

Revert "linker: remove link from external library on unload"
authorDimitry Ivanov <dimitry@google.com>
Wed, 17 May 2017 18:46:54 +0000 (11:46 -0700)
committerDimitry Ivanov <dimitry@google.com>
Thu, 18 May 2017 01:02:54 +0000 (01:02 +0000)
This reverts commit b37d10cc8017c102530c096537890b7c6215ad2b.

Was merged from nyc-dev to master and oc-dev by mistake.

Bug: http://b/38384727
Test: bionic-unit-tests
Change-Id: I7cd352baceb3180342abb6ffec1dfa96a217961f

linker/linker.cpp

index 9a6543c..c661624 100644 (file)
@@ -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);