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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 501127: Rearrange build configurations - make it clearer and allow better support for... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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 | « chrome/chrome.gyp ('k') | chrome/installer/installer_util.gypi » ('j') | 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'browser_tests_sources_views_specific': [ 7 'browser_tests_sources_views_specific': [
8 'browser/extensions/browser_action_test_util_views.cc', 8 'browser/extensions/browser_action_test_util_views.cc',
9 'browser/views/find_bar_host_browsertest.cc', 9 'browser/views/find_bar_host_browsertest.cc',
10 ], 10 ],
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 '../google_update/google_update.gyp:google_update', 366 '../google_update/google_update.gyp:google_update',
367 '../views/views.gyp:views', 367 '../views/views.gyp:views',
368 '<(allocator_target)', 368 '<(allocator_target)',
369 ], 369 ],
370 'link_settings': { 370 'link_settings': {
371 'libraries': [ 371 'libraries': [
372 '-lOleAcc.lib', 372 '-lOleAcc.lib',
373 ], 373 ],
374 }, 374 },
375 'configurations': { 375 'configurations': {
376 'Debug': { 376 'Debug_Base': {
377 'msvs_settings': { 377 'msvs_settings': {
378 'VCLinkerTool': { 378 'VCLinkerTool': {
379 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 379 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
380 }, 380 },
381 }, 381 },
382 }, 382 },
383 }, 383 },
384 }, { # else: OS != "win" 384 }, { # else: OS != "win"
385 'sources!': [ 385 'sources!': [
386 # TODO(port)? (Most of these include windows.h or similar.) 386 # TODO(port)? (Most of these include windows.h or similar.)
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 # run time dependency 449 # run time dependency
450 '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin', 450 '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin',
451 '<(allocator_target)', 451 '<(allocator_target)',
452 ], 452 ],
453 'link_settings': { 453 'link_settings': {
454 'libraries': [ 454 'libraries': [
455 '-lOleAcc.lib', 455 '-lOleAcc.lib',
456 ], 456 ],
457 }, 457 },
458 'configurations': { 458 'configurations': {
459 'Debug': { 459 'Debug_Base': {
460 'msvs_settings': { 460 'msvs_settings': {
461 'VCLinkerTool': { 461 'VCLinkerTool': {
462 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 462 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
463 }, 463 },
464 }, 464 },
465 }, 465 },
466 }, 466 },
467 }], 467 }],
468 ], 468 ],
469 }, 469 },
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
994 'link_settings': { 994 'link_settings': {
995 'libraries': [ 995 'libraries': [
996 '-lcomsupp.lib', 996 '-lcomsupp.lib',
997 '-loleacc.lib', 997 '-loleacc.lib',
998 '-lrpcrt4.lib', 998 '-lrpcrt4.lib',
999 '-lurlmon.lib', 999 '-lurlmon.lib',
1000 '-lwinmm.lib', 1000 '-lwinmm.lib',
1001 ], 1001 ],
1002 }, 1002 },
1003 'configurations': { 1003 'configurations': {
1004 'Debug': { 1004 'Debug_Base': {
1005 'msvs_settings': { 1005 'msvs_settings': {
1006 'VCLinkerTool': { 1006 'VCLinkerTool': {
1007 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 1007 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
1008 }, 1008 },
1009 }, 1009 },
1010 }, 1010 },
1011 }, 1011 },
1012 }, { # else: OS != "win" 1012 }, { # else: OS != "win"
1013 'sources!': [ 1013 'sources!': [
1014 'browser/bookmarks/bookmark_codec_unittest.cc', 1014 'browser/bookmarks/bookmark_codec_unittest.cc',
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
1129 ], 1129 ],
1130 'include_dirs': [ 1130 'include_dirs': [
1131 'third_party/wtl/include', 1131 'third_party/wtl/include',
1132 ], 1132 ],
1133 'dependencies': [ 1133 'dependencies': [
1134 'chrome_dll_version', 1134 'chrome_dll_version',
1135 'installer/installer.gyp:installer_util_strings', 1135 'installer/installer.gyp:installer_util_strings',
1136 '<(allocator_target)', 1136 '<(allocator_target)',
1137 ], 1137 ],
1138 'configurations': { 1138 'configurations': {
1139 'Debug': { 1139 'Debug_Base': {
1140 'msvs_settings': { 1140 'msvs_settings': {
1141 'VCLinkerTool': { 1141 'VCLinkerTool': {
1142 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 1142 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
1143 }, 1143 },
1144 }, 1144 },
1145 }, 1145 },
1146 } 1146 }
1147 }], 1147 }],
1148 ['OS=="linux"', { 1148 ['OS=="linux"', {
1149 'dependencies': [ 1149 'dependencies': [
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
1478 '<(allocator_target)', 1478 '<(allocator_target)',
1479 ], 1479 ],
1480 'link_settings': { 1480 'link_settings': {
1481 'libraries': [ 1481 'libraries': [
1482 '-lcrypt32.lib', 1482 '-lcrypt32.lib',
1483 '-lws2_32.lib', 1483 '-lws2_32.lib',
1484 '-lsecur32.lib', 1484 '-lsecur32.lib',
1485 ], 1485 ],
1486 }, 1486 },
1487 'configurations': { 1487 'configurations': {
1488 'Debug': { 1488 'Debug_Base': {
1489 'msvs_settings': { 1489 'msvs_settings': {
1490 'VCLinkerTool': { 1490 'VCLinkerTool': {
1491 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 1491 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
1492 }, 1492 },
1493 }, 1493 },
1494 }, 1494 },
1495 }, 1495 },
1496 }, { # else: OS != "win" 1496 }, { # else: OS != "win"
1497 'sources!': [ 1497 'sources!': [
1498 'browser/sync/util/data_encryption_unittest.cc', 1498 'browser/sync/util/data_encryption_unittest.cc',
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
1548 'browser/visitedlink_perftest.cc', 1548 'browser/visitedlink_perftest.cc',
1549 ], 1549 ],
1550 }], 1550 }],
1551 ['OS=="win" or (OS=="linux" and toolkit_views==1)', { 1551 ['OS=="win" or (OS=="linux" and toolkit_views==1)', {
1552 'dependencies': [ 1552 'dependencies': [
1553 '../views/views.gyp:views', 1553 '../views/views.gyp:views',
1554 ], 1554 ],
1555 }], 1555 }],
1556 ['OS=="win"', { 1556 ['OS=="win"', {
1557 'configurations': { 1557 'configurations': {
1558 'Debug': { 1558 'Debug_Base': {
1559 'msvs_settings': { 1559 'msvs_settings': {
1560 'VCLinkerTool': { 1560 'VCLinkerTool': {
1561 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 1561 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
1562 }, 1562 },
1563 }, 1563 },
1564 }, 1564 },
1565 }, 1565 },
1566 'dependencies': [ 1566 'dependencies': [
1567 '<(allocator_target)', 1567 '<(allocator_target)',
1568 ], 1568 ],
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
1659 'include_dirs': [ 1659 'include_dirs': [
1660 'third_party/wtl/include', 1660 'third_party/wtl/include',
1661 ], 1661 ],
1662 'dependencies': [ 1662 'dependencies': [
1663 'chrome_dll_version', 1663 'chrome_dll_version',
1664 'installer/installer.gyp:installer_util_strings', 1664 'installer/installer.gyp:installer_util_strings',
1665 '../views/views.gyp:views', 1665 '../views/views.gyp:views',
1666 '<(allocator_target)', 1666 '<(allocator_target)',
1667 ], 1667 ],
1668 'configurations': { 1668 'configurations': {
1669 'Debug': { 1669 'Debug_Base': {
1670 'msvs_settings': { 1670 'msvs_settings': {
1671 'VCLinkerTool': { 1671 'VCLinkerTool': {
1672 'LinkIncremental': '<(msvs_large_module_debug_link_mode) ', 1672 'LinkIncremental': '<(msvs_large_module_debug_link_mode) ',
1673 }, 1673 },
1674 }, 1674 },
1675 }, 1675 },
1676 }, 1676 },
1677 }], 1677 }],
1678 ], 1678 ],
1679 }, 1679 },
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
1824 ] 1824 ]
1825 }], # 'coverage!=0' 1825 }], # 'coverage!=0'
1826 ], # 'conditions' 1826 ], # 'conditions'
1827 } 1827 }
1828 1828
1829 # Local Variables: 1829 # Local Variables:
1830 # tab-width:2 1830 # tab-width:2
1831 # indent-tabs-mode:nil 1831 # indent-tabs-mode:nil
1832 # End: 1832 # End:
1833 # vim: set expandtab tabstop=2 shiftwidth=2: 1833 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/installer/installer_util.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698