Commit 05b47b88 authored by jschuh's avatar jschuh Committed by Commit bot

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}
parent b82a480d
...@@ -120,6 +120,19 @@ ...@@ -120,6 +120,19 @@
'<@(chrome_utility_sources)', '<@(chrome_utility_sources)',
], ],
'conditions': [ 'conditions': [
['OS=="win"', {
'link_settings': {
'msvs_settings': {
'VCLinkerTool': {
'DelayLoadDLLs': [
# Prevent wininet from loading in the renderer.
# http://crbug.com/460679
'wininet.dll',
],
},
},
},
}],
['OS!="win" and OS!="mac" and use_openssl==1', { ['OS!="win" and OS!="mac" and use_openssl==1', {
'sources!': [ 'sources!': [
'utility/importer/nss_decryptor.cc', 'utility/importer/nss_decryptor.cc',
......
...@@ -48,6 +48,11 @@ static_library("utility") { ...@@ -48,6 +48,11 @@ static_library("utility") {
sources += sources +=
rebase_path(gypi_values.chrome_utility_shared_media_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) { if (is_win || is_mac) {
sources += sources +=
rebase_path(gypi_values.chrome_utility_win_mac_media_gallery_sources, rebase_path(gypi_values.chrome_utility_win_mac_media_gallery_sources,
......
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