commit 5f7fb9c5c360038d45863c9fddc20bb5a51fcd7c
author Dimitry Ivanov <dimitry@google.com> Tue May 16 23:09:50 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 23:09:50 2017 +0000
tree a9d0362a080f8c0f8319a263baca608436393b5c
parent 2514cb784db259a64bd22871aff0ac3baf8119f1
parent 91779f4867dd92024c90a3212b92ec4ded983123

Merge "linker: remove link from external library on unload" into mnc-dev am: 8dee813dfa am: 15db978797
am: 91779f4867

Change-Id: Ifef3f85a01f7deaf7a17c2c562304d3af1361705

linker/linked_list.h

diff --git a/linker/linked_list.h b/linker/linked_list.h
index 8003dbf..0572e63 100644
--- a/linker/linked_list.h
+++ b/linker/linked_list.h
@@ -127,7 +127,13 @@
         } else {
           p->next = next;
         }
+
+        if (tail_ == e) {
+          tail_ = p;
+        }
+
         Allocator::free(e);
+
         e = next;
       } else {
         p = e;

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index d3ac1d0..19f5e94 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1597,6 +1597,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 {
             depth_first_list.push_front(child);