summaryrefslogtreecommitdiffstats
path: root/chrome/utility
diff options
context:
space:
mode:
authorjschuh <jschuh@chromium.org>2015-02-25 13:40:57 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-25 21:42:11 +0000
commit05b47b88e7bb2357ff5ad6ffc24ffdb3482b762c (patch)
treec9b58a0355c47e3ef9201396464e33fea48f1ba7 /chrome/utility
parentb82a480da152650228090c13ac26b1582b0b8896 (diff)
downloadchromium_src-05b47b88e7bb2357ff5ad6ffc24ffdb3482b762c.zip
chromium_src-05b47b88e7bb2357ff5ad6ffc24ffdb3482b762c.tar.gz
chromium_src-05b47b88e7bb2357ff5ad6ffc24ffdb3482b762c.tar.bz2
Make wininet.dll delay load
This is used only in the utility process but loading it causes conflicts with AppContainers in the renderer. BUG=460679 R=scottmg@chromium.org,thestig@chromium.org TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/945663004 Cr-Commit-Position: refs/heads/master@{#318123}
Diffstat (limited to 'chrome/utility')
-rw-r--r--chrome/utility/BUILD.gn5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
index a4ca50e..a99d954 100644
--- a/chrome/utility/BUILD.gn
+++ b/chrome/utility/BUILD.gn
@@ -48,6 +48,11 @@ static_library("utility") {
sources +=
rebase_path(gypi_values.chrome_utility_shared_media_sources, ".", "..")
+ # Prevent wininet from loading in the renderer. http://crbug.com/460679
+ if (is_win) {
+ ldflags = [ "/DELAYLOAD:wininet.dll" ]
+ }
+
if (is_win || is_mac) {
sources +=
rebase_path(gypi_values.chrome_utility_win_mac_media_gallery_sources,