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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 1475883002: Revert of New build flag system, convert Google Now flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « chrome/chrome_resources.gyp ('k') | chrome/chrome_tests_unit.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'variables': { 5 'variables': {
6 'chrome_browser_extensions_test_support_sources': [ 6 'chrome_browser_extensions_test_support_sources': [
7 # A list of sources which is shared between different browser tests. 7 # A list of sources which is shared between different browser tests.
8 'browser/apps/app_browsertest_util.cc', 8 'browser/apps/app_browsertest_util.cc',
9 'browser/apps/app_browsertest_util.h', 9 'browser/apps/app_browsertest_util.h',
10 'browser/extensions/browsertest_util.cc', 10 'browser/extensions/browsertest_util.cc',
(...skipping 1599 matching lines...) Expand 10 before | Expand all | Expand 10 after
1610 ], 1610 ],
1611 }], 1611 }],
1612 ], 1612 ],
1613 }, 1613 },
1614 { 1614 {
1615 # GN version: //chrome/test:interactive_ui_tests 1615 # GN version: //chrome/test:interactive_ui_tests
1616 'target_name': 'interactive_ui_tests', 1616 'target_name': 'interactive_ui_tests',
1617 'type': 'executable', 1617 'type': 'executable',
1618 'dependencies': [ 1618 'dependencies': [
1619 'browser', 1619 'browser',
1620 'chrome_common_features',
1621 'chrome_resources.gyp:chrome_resources', 1620 'chrome_resources.gyp:chrome_resources',
1622 'chrome_resources.gyp:chrome_strings', 1621 'chrome_resources.gyp:chrome_strings',
1623 'chrome_resources.gyp:packed_extra_resources', 1622 'chrome_resources.gyp:packed_extra_resources',
1624 'chrome_resources.gyp:packed_resources', 1623 'chrome_resources.gyp:packed_resources',
1625 'debugger', 1624 'debugger',
1626 'renderer', 1625 'renderer',
1627 'test_support_common', 1626 'test_support_common',
1628 'test_support_ui', 1627 'test_support_ui',
1629 '../components/components.gyp:guest_view_test_support', 1628 '../components/components.gyp:guest_view_test_support',
1630 '../components/components_resources.gyp:components_resources', 1629 '../components/components_resources.gyp:components_resources',
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
2105 ], 2104 ],
2106 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 2105 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2107 'msvs_disabled_warnings': [ 4267, ], 2106 'msvs_disabled_warnings': [ 4267, ],
2108 }, 2107 },
2109 { 2108 {
2110 # Executable that runs each browser test in a new process. 2109 # Executable that runs each browser test in a new process.
2111 'target_name': 'browser_tests', 2110 'target_name': 'browser_tests',
2112 'type': 'executable', 2111 'type': 'executable',
2113 'dependencies': [ 2112 'dependencies': [
2114 'browser', 2113 'browser',
2115 'chrome_common_features',
2116 'chrome_resources.gyp:browser_tests_pak', 2114 'chrome_resources.gyp:browser_tests_pak',
2117 'chrome_resources.gyp:chrome_resources', 2115 'chrome_resources.gyp:chrome_resources',
2118 'chrome_resources.gyp:chrome_strings', 2116 'chrome_resources.gyp:chrome_strings',
2119 'chrome_resources.gyp:packed_extra_resources', 2117 'chrome_resources.gyp:packed_extra_resources',
2120 'chrome_resources.gyp:packed_resources', 2118 'chrome_resources.gyp:packed_resources',
2121 'common/extensions/api/api.gyp:chrome_api', 2119 'common/extensions/api/api.gyp:chrome_api',
2122 'renderer', 2120 'renderer',
2123 'test_support_common', 2121 'test_support_common',
2124 'test_support_sync_integration', 2122 'test_support_sync_integration',
2125 'test_support_ui', 2123 'test_support_ui',
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
2650 ], 2648 ],
2651 }], 2649 }],
2652 ], # conditions 2650 ], # conditions
2653 }, # target browser_tests 2651 }, # target browser_tests
2654 { 2652 {
2655 # Executable that runs each perf browser test in a new process. 2653 # Executable that runs each perf browser test in a new process.
2656 'target_name': 'performance_browser_tests', 2654 'target_name': 'performance_browser_tests',
2657 'type': 'executable', 2655 'type': 'executable',
2658 'dependencies': [ 2656 'dependencies': [
2659 'browser', 2657 'browser',
2660 'chrome_common_features',
2661 'chrome_resources.gyp:chrome_resources', 2658 'chrome_resources.gyp:chrome_resources',
2662 'chrome_resources.gyp:chrome_strings', 2659 'chrome_resources.gyp:chrome_strings',
2663 'chrome_resources.gyp:packed_extra_resources', 2660 'chrome_resources.gyp:packed_extra_resources',
2664 'chrome_resources.gyp:packed_resources', 2661 'chrome_resources.gyp:packed_resources',
2665 'renderer', 2662 'renderer',
2666 'test_support_common', 2663 'test_support_common',
2667 'test_support_ui', 2664 'test_support_ui',
2668 '../base/base.gyp:base', 2665 '../base/base.gyp:base',
2669 '../base/base.gyp:base_i18n', 2666 '../base/base.gyp:base_i18n',
2670 '../base/base.gyp:test_support_base', 2667 '../base/base.gyp:test_support_base',
(...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after
3492 'utility', 3489 'utility',
3493 ], 3490 ],
3494 'sources': [ 3491 'sources': [
3495 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3492 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3496 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3493 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3497 ], 3494 ],
3498 }] 3495 }]
3499 }], 3496 }],
3500 ], # 'conditions' 3497 ], # 'conditions'
3501 } 3498 }
OLDNEW
« no previous file with comments | « chrome/chrome_resources.gyp ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698