Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Side by Side Diff: chrome_frame/chrome_frame.gyp

Issue 5757004: Fix ChromeFrame perf test builder redness by delay loading nspr4.dll. We need... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'xul_sdk_dir': '../third_party/xulrunner-sdk/<(OS)', 8 'xul_sdk_dir': '../third_party/xulrunner-sdk/<(OS)',
9 9
10 'variables': { 10 'variables': {
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 '<@(xul_include_directories)', 413 '<@(xul_include_directories)',
414 '<(DEPTH)/third_party/wtl/include', 414 '<(DEPTH)/third_party/wtl/include',
415 ], 415 ],
416 'conditions': [ 416 'conditions': [
417 ['OS=="win"', { 417 ['OS=="win"', {
418 'configurations': { 418 'configurations': {
419 'Debug_Base': { 419 'Debug_Base': {
420 'msvs_settings': { 420 'msvs_settings': {
421 'VCLinkerTool': { 421 'VCLinkerTool': {
422 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 422 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
423 'DelayLoadDLLs': ['nspr4.dll'],
424 }, 423 },
425 }, 424 },
426 }, 425 },
427 }, 426 },
428 'link_settings': { 427 'link_settings': {
429 'libraries': [ 428 'libraries': [
430 '-loleacc.lib', 429 '-loleacc.lib',
431 ], 430 ],
432 }, 431 },
432 'msvs_settings': {
433 'VCLinkerTool': {
434 'DelayLoadDLLs': ['nspr4.dll'],
435 },
436 },
433 'dependencies': [ 437 'dependencies': [
434 '../breakpad/breakpad.gyp:breakpad_handler', 438 '../breakpad/breakpad.gyp:breakpad_handler',
435 '../chrome/chrome.gyp:automation', 439 '../chrome/chrome.gyp:automation',
436 '../chrome/chrome.gyp:crash_service', 440 '../chrome/chrome.gyp:crash_service',
437 '../chrome/chrome.gyp:installer_util', 441 '../chrome/chrome.gyp:installer_util',
438 '../google_update/google_update.gyp:google_update', 442 '../google_update/google_update.gyp:google_update',
439 ], 443 ],
440 'sources': [ 444 'sources': [
441 '../base/test/test_file_util_win.cc', 445 '../base/test/test_file_util_win.cc',
442 ] 446 ]
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
1164 ], # 'conditions' 1168 ], # 'conditions'
1165 } 1169 }
1166 1170
1167 # vim: shiftwidth=2:et:ai:tabstop=2 1171 # vim: shiftwidth=2:et:ai:tabstop=2
1168 1172
1169 # Local Variables: 1173 # Local Variables:
1170 # tab-width:2 1174 # tab-width:2
1171 # indent-tabs-mode:nil 1175 # indent-tabs-mode:nil
1172 # End: 1176 # End:
1173 # vim: set expandtab tabstop=2 shiftwidth=2: 1177 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698