release-request-6c498b17-9310-412b-ad36-3dcf25ffef73-for-git_oc-release-4017086 snap-temp-L16500000064871237

Change-Id: I33913533e0a67425f2145b9aed399c57d5dea333

1 files changed, 3 insertions, 0 deletions

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