diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-30 19:20:18 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-30 19:20:18 +0000 |
commit | f0392496b1d4015b7ba5fb8847f05ad03c346f9a (patch) | |
tree | 1c7386dffada672b5744cf4f4a331c0914383a70 | |
parent | e360a1c8a389772718814d291978390e0b662805 (diff) | |
parent | 65bd6dad5bc8d9f83324a121b61fd735d5462d4d (diff) | |
download | bionic-nougat-mr2.1-release.tar.gz |
Merge cherrypicks of [2331043, 2330986, 2331024, 2331025, 2330859, 2330970, 2331044, 2330893, 2330950, 2330951, 2330940, 2331045, 2330954, 2330799, 2330987, 2331004, 2331061, 2331005, 2331047, 2330955, 2331030, 2331031, 2331101, 2330972, 2330956, 2331032, 2331006, 2330894, 2331063, 2331064, 2330895, 2331048, 2331102, 2331035, 2331007, 2331083, 2331103, 2331104, 2330897, 2331084, 2331067, 2331009, 2331010, 2330898, 2330989, 2331105, 2330899, 2331011, 2331069, 2330990, 2331121, 2331122, 2331086] into nyc-mr2-security-a-releaseandroid-7.1.2_r30android-7.1.2_r23nougat-mr2.1-release
Change-Id: Ie11dc74ec5bd6c9f489670537e41909c161f067a
-rw-r--r-- | linker/linker.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp index 9dc928eb4..a043b859a 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -2246,6 +2246,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 { unload_list.push_front(child); |