diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 05:01:27 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 05:01:27 +0000 |
| commit | 549eeef340ea805e23f5e0a7e68d20cd4de4d4e3 (patch) | |
| tree | 1abb100fed83e8307190b1b8db9fa807ae7d377d /chrome_frame | |
| parent | 4bc58f1b6897fc7e80d3f00412ce0c72559644d3 (diff) | |
| download | chromium_src-549eeef340ea805e23f5e0a7e68d20cd4de4d4e3.zip chromium_src-549eeef340ea805e23f5e0a7e68d20cd4de4d4e3.tar.gz chromium_src-549eeef340ea805e23f5e0a7e68d20cd4de4d4e3.tar.bz2 | |
Fix ChromeFrame perf test builder redness by delay loading nspr4.dll. We need to investigate
where this dependency comes from.
TBR=amit
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/5757004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69103 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index f31ba89..0803255 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -420,7 +420,6 @@ 'msvs_settings': { 'VCLinkerTool': { 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', - 'DelayLoadDLLs': ['nspr4.dll'], }, }, }, @@ -430,6 +429,11 @@ '-loleacc.lib', ], }, + 'msvs_settings': { + 'VCLinkerTool': { + 'DelayLoadDLLs': ['nspr4.dll'], + }, + }, 'dependencies': [ '../breakpad/breakpad.gyp:breakpad_handler', '../chrome/chrome.gyp:automation', |