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

Side by Side Diff: chrome_frame/chrome_frame.gyp

Issue 5845002: Attempt to get rid of chrome_frame_perftests dependency on nspr.lib which cau... (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 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 '../testing/gmock.gyp:gmock', 379 '../testing/gmock.gyp:gmock',
380 '../testing/gtest.gyp:gtest', 380 '../testing/gtest.gyp:gtest',
381 '../third_party/libxml/libxml.gyp:libxml', 381 '../third_party/libxml/libxml.gyp:libxml',
382 '../third_party/libxslt/libxslt.gyp:libxslt', 382 '../third_party/libxslt/libxslt.gyp:libxslt',
383 'chrome_frame_ie', 383 'chrome_frame_ie',
384 'chrome_frame_npapi', 384 'chrome_frame_npapi',
385 'chrome_frame_strings', 385 'chrome_frame_strings',
386 'chrome_frame_utils', 386 'chrome_frame_utils',
387 'chrome_tab_idl', 387 'chrome_tab_idl',
388 'npchrome_frame', 388 'npchrome_frame',
389 'xulrunner_sdk',
390 ], 389 ],
391 'sources': [ 390 'sources': [
392 '../base/perf_test_suite.h', 391 '../base/perf_test_suite.h',
393 '../base/perftimer.cc', 392 '../base/perftimer.cc',
394 '../base/test/test_file_util.h', 393 '../base/test/test_file_util.h',
395 '../chrome/test/chrome_process_util.cc', 394 '../chrome/test/chrome_process_util.cc',
396 '../chrome/test/chrome_process_util.h', 395 '../chrome/test/chrome_process_util.h',
397 '../chrome/test/ui/ui_test.cc', 396 '../chrome/test/ui/ui_test.cc',
398 'chrome_tab.h', 397 'chrome_tab.h',
399 'test/chrome_frame_test_utils.cc', 398 'test/chrome_frame_test_utils.cc',
(...skipping 24 matching lines...) Expand all
424 }, 423 },
425 }, 424 },
426 }, 425 },
427 'link_settings': { 426 'link_settings': {
428 'libraries': [ 427 'libraries': [
429 '-loleacc.lib', 428 '-loleacc.lib',
430 ], 429 ],
431 }, 430 },
432 'msvs_settings': { 431 'msvs_settings': {
433 'VCLinkerTool': { 432 'VCLinkerTool': {
433 'IgnoreDefaultLibraryNames': ['nspr.lib', 'nspr4.lib'],
434 'DelayLoadDLLs': ['nspr4.dll'], 434 'DelayLoadDLLs': ['nspr4.dll'],
435 }, 435 },
436 }, 436 },
437 'dependencies': [ 437 'dependencies': [
438 '../breakpad/breakpad.gyp:breakpad_handler', 438 '../breakpad/breakpad.gyp:breakpad_handler',
439 '../chrome/chrome.gyp:automation', 439 '../chrome/chrome.gyp:automation',
440 '../chrome/chrome.gyp:crash_service', 440 '../chrome/chrome.gyp:crash_service',
441 '../chrome/chrome.gyp:installer_util', 441 '../chrome/chrome.gyp:installer_util',
442 '../google_update/google_update.gyp:google_update', 442 '../google_update/google_update.gyp:google_update',
443 ], 443 ],
(...skipping 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
1168 ], # 'conditions' 1168 ], # 'conditions'
1169 } 1169 }
1170 1170
1171 # vim: shiftwidth=2:et:ai:tabstop=2 1171 # vim: shiftwidth=2:et:ai:tabstop=2
1172 1172
1173 # Local Variables: 1173 # Local Variables:
1174 # tab-width:2 1174 # tab-width:2
1175 # indent-tabs-mode:nil 1175 # indent-tabs-mode:nil
1176 # End: 1176 # End:
1177 # 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