Commit 45008417 authored by Cliff Smolinsky's avatar Cliff Smolinsky Committed by Commit Bot

Add delayloads for binaries linked when is_chrome_branded=true.

When building chrome with is_chrome_branded=true there are additional
binaries that are linked in. These additional binaries cause failures
in the delayloads_unittests and violate the requirements of the user32
delayloads change. This change adds the two violations to the
delayload list (since neither are required to be statically linked).

This is a follow-up to
https://chromium-review.googlesource.com/c/chromium/src/+/1551709.

Bug: 963048
Change-Id: I0e09fd0ec7062e75dd3277fb1d7441d90e8e3068
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1612701Reviewed-by: default avatarBruce Dawson <brucedawson@chromium.org>
Commit-Queue: Cliff Smolinsky <cliffsmo@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#660074}
parent b6fa4c80
...@@ -249,6 +249,7 @@ if (!is_android && !is_mac) { ...@@ -249,6 +249,7 @@ if (!is_android && !is_mac) {
"/DELAYLOAD:shell32.dll", "/DELAYLOAD:shell32.dll",
"/DELAYLOAD:shlwapi.dll", "/DELAYLOAD:shlwapi.dll",
"/DELAYLOAD:user32.dll", "/DELAYLOAD:user32.dll",
"/DELAYLOAD:userenv.dll",
"/DELAYLOAD:uxtheme.dll", "/DELAYLOAD:uxtheme.dll",
"/DELAYLOAD:wer.dll", "/DELAYLOAD:wer.dll",
"/DELAYLOAD:wevtapi.dll", "/DELAYLOAD:wevtapi.dll",
...@@ -454,6 +455,7 @@ if (is_win) { ...@@ -454,6 +455,7 @@ if (is_win) {
"/DELAYLOAD:imagehlp.dll", "/DELAYLOAD:imagehlp.dll",
"/DELAYLOAD:imm32.dll", "/DELAYLOAD:imm32.dll",
"/DELAYLOAD:iphlpapi.dll", "/DELAYLOAD:iphlpapi.dll",
"/DELAYLOAD:msi.dll",
"/DELAYLOAD:netapi32.dll", "/DELAYLOAD:netapi32.dll",
"/DELAYLOAD:ole32.dll", "/DELAYLOAD:ole32.dll",
"/DELAYLOAD:oleacc.dll", "/DELAYLOAD:oleacc.dll",
......
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