commit 66b8d2ac168043e962994141f6ebe44a1fb39527
author android-build-team Robot <android-build-team-robot@google.com> Tue Jul 11 22:41:43 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jul 11 22:41:43 2017 +0000
tree ae33e49fbcdddb79e9ad8b950d5874eef1cc77de
parent e04608196aae9d4afbc08294d01a419cca312e6a
parent 3ee66f3b920b162c357a7a4a2c2d4ef0e9e89a09

release-request-556939d2-cc5e-453a-b797-8a7cb6dacac2-for-git_nyc-mr1-security-f-release-4118426 snap-temp-L72200000081371809

Change-Id: I43716359c9b1c7f7c869edd573d77ad6472a8ca8

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 9dc928e..a043b85 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -2246,6 +2246,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);