Commit 6472da3f authored by Penny MacNeil's avatar Penny MacNeil Committed by Commit Bot

[chrome_elf] Temporarily still listen to the old beacon.

Don't initialize third_party_dlls if the beacon says not to.

Test: chrome_elf_unittests.exe
Change-Id: I5334d82eb11ecfcc026ed1bfaf25a02070830e59
Reviewed-on: https://chromium-review.googlesource.com/1180267Reviewed-by: default avatarTom Sepez <tsepez@chromium.org>
Commit-Queue: Penny MacNeil <pennymac@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584227}
parent 738fec5b
......@@ -74,8 +74,8 @@ BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) {
// Initialize blacklist before initializing third_party_dlls.
// Note: "blacklist" is deprecated in favor of "third_party_dlls", but
// beacon management temporarily remains in the blacklist project.
blacklist::Initialize(false); // Don't force, abort if beacon is present.
third_party_dlls::Init();
if (blacklist::Initialize(false))
third_party_dlls::Init();
} __except (elf_crash::GenerateCrashDump(GetExceptionInformation())) {
}
} else if (reason == DLL_PROCESS_DETACH) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment