commit 819e81817d6c96e7b88c8fb66db74049a3051d68
author Nick Reuter <nreuter85@gmail.com> Mon Aug 07 20:52:06 2017 -0500
committer Nick Reuter <nreuter85@gmail.com> Mon Aug 07 20:52:06 2017 -0500
tree 006f3e269bcc1103d277c217a23647cfc174445c
parent 8a8c43a00c85671773d7cac32a8c929f9da0876a
parent 3581f2660f79d289ddbcc39e150a70c286b9d07b

Merge tag 'android-7.1.2_r29' into HEAD

Android 7.1.2 Release 29 (NJH47F)

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 0715fa2..322cf5d 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -2309,6 +2309,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);