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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 125103007: Remove .rc files that are in resources.pak from test sources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 11 months 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 | 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 'chromedriver_unittest_sources': [ 6 'chromedriver_unittest_sources': [
7 'test/chromedriver/capabilities_unittest.cc', 7 'test/chromedriver/capabilities_unittest.cc',
8 'test/chromedriver/chrome/chrome_finder_unittest.cc', 8 'test/chromedriver/chrome/chrome_finder_unittest.cc',
9 'test/chromedriver/chrome/console_logger_unittest.cc', 9 'test/chromedriver/chrome/console_logger_unittest.cc',
10 'test/chromedriver/chrome/device_manager_unittest.cc', 10 'test/chromedriver/chrome/device_manager_unittest.cc',
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 '../ui/resources/cursors/zoom_out.cur', 461 '../ui/resources/cursors/zoom_out.cur',
462 462
463 'app/chrome_dll.rc', 463 'app/chrome_dll.rc',
464 'test/data/resource.rc', 464 'test/data/resource.rc',
465 465
466 # TODO: It would be nice to have these pulled in 466 # TODO: It would be nice to have these pulled in
467 # automatically from direct_dependent_settings in 467 # automatically from direct_dependent_settings in
468 # their various targets (net.gyp:net_resources, etc.), 468 # their various targets (net.gyp:net_resources, etc.),
469 # but that causes errors in other targets when 469 # but that causes errors in other targets when
470 # resulting .res files get referenced multiple times. 470 # resulting .res files get referenced multiple times.
471 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
472 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
473 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
474 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
475 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 471 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
476 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
477 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
478 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 472 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ',
479 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
480 473
481 'browser/ui/views/accessibility/browser_views_accessibility_browsert est.cc', 474 'browser/ui/views/accessibility/browser_views_accessibility_browsert est.cc',
482 ], 475 ],
483 'conditions': [ 476 'conditions': [
484 ['win_use_allocator_shim==1', { 477 ['win_use_allocator_shim==1', {
485 'dependencies': [ 478 'dependencies': [
486 '../base/allocator/allocator.gyp:allocator', 479 '../base/allocator/allocator.gyp:allocator',
487 ], 480 ],
488 }], 481 }],
489 ['use_aura==1', { 482 ['use_aura==1', {
(...skipping 1347 matching lines...) Expand 10 before | Expand all | Expand 10 after
1837 }], 1830 }],
1838 ['enable_webrtc==0', { 1831 ['enable_webrtc==0', {
1839 'sources!': [ 1832 'sources!': [
1840 'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_br owsertest.cc', 1833 'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_br owsertest.cc',
1841 'browser/extensions/api/webrtc_logging_private/webrtc_logging_privat e_apitest.cc', 1834 'browser/extensions/api/webrtc_logging_private/webrtc_logging_privat e_apitest.cc',
1842 'browser/media/chrome_webrtc_browsertest.cc', 1835 'browser/media/chrome_webrtc_browsertest.cc',
1843 ], 1836 ],
1844 }], 1837 }],
1845 ['OS=="win"', { 1838 ['OS=="win"', {
1846 'sources': [ 1839 'sources': [
1847 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
1848 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
1849 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
1850 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
1851 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 1840 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
1852 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
1853 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
1854 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 1841 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ',
1855 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
1856 ], 1842 ],
1857 'include_dirs': [ 1843 'include_dirs': [
1858 '<(DEPTH)/third_party/wtl/include', 1844 '<(DEPTH)/third_party/wtl/include',
1859 ], 1845 ],
1860 'dependencies': [ 1846 'dependencies': [
1861 'browser_tests_exe_pdb_workaround', 1847 'browser_tests_exe_pdb_workaround',
1862 'chrome_version_resources', 1848 'chrome_version_resources',
1863 'security_tests', # run time dependency 1849 'security_tests', # run time dependency
1864 ], 1850 ],
1865 'conditions': [ 1851 'conditions': [
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
2131 'webui', 2117 'webui',
2132 '<(RULE_INPUT_PATH)', 2118 '<(RULE_INPUT_PATH)',
2133 'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js', 2119 'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
2134 '<@(_outputs)', 2120 '<@(_outputs)',
2135 ], 2121 ],
2136 }, 2122 },
2137 ], 2123 ],
2138 'conditions': [ 2124 'conditions': [
2139 ['OS=="win"', { 2125 ['OS=="win"', {
2140 'sources': [ 2126 'sources': [
2141 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2142 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
2143 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2144 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
2145 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2127 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2146 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
2147 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
2148 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 2128 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ',
2149 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
2150 ], 2129 ],
2151 'include_dirs': [ 2130 'include_dirs': [
2152 '<(DEPTH)/third_party/wtl/include', 2131 '<(DEPTH)/third_party/wtl/include',
2153 ], 2132 ],
2154 'dependencies': [ 2133 'dependencies': [
2155 'chrome_version_resources', 2134 'chrome_version_resources',
2156 ], 2135 ],
2157 'conditions': [ 2136 'conditions': [
2158 ['win_use_allocator_shim==1', { 2137 ['win_use_allocator_shim==1', {
2159 'dependencies': [ 2138 'dependencies': [
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
2496 # Dictionary sync is disabled on Mac. 2475 # Dictionary sync is disabled on Mac.
2497 'sources!': [ 2476 'sources!': [
2498 'browser/sync/test/integration/multiple_client_dictionary_sync_test. cc', 2477 'browser/sync/test/integration/multiple_client_dictionary_sync_test. cc',
2499 'browser/sync/test/integration/single_client_dictionary_sync_test.cc ', 2478 'browser/sync/test/integration/single_client_dictionary_sync_test.cc ',
2500 'browser/sync/test/integration/two_client_dictionary_sync_test.cc', 2479 'browser/sync/test/integration/two_client_dictionary_sync_test.cc',
2501 ], 2480 ],
2502 }], 2481 }],
2503 ['OS=="win"', { 2482 ['OS=="win"', {
2504 'msvs_large_pdb': 1, 2483 'msvs_large_pdb': 1,
2505 'sources': [ 2484 'sources': [
2506 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2507 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
2508 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2509 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
2510 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2485 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2511 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
2512 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
2513 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 2486 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ',
2514 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
2515 ], 2487 ],
2516 'include_dirs': [ 2488 'include_dirs': [
2517 '<(DEPTH)/third_party/wtl/include', 2489 '<(DEPTH)/third_party/wtl/include',
2518 ], 2490 ],
2519 'dependencies': [ 2491 'dependencies': [
2520 'chrome_version_resources', 2492 'chrome_version_resources',
2521 ], 2493 ],
2522 'conditions': [ 2494 'conditions': [
2523 ['win_use_allocator_shim==1', { 2495 ['win_use_allocator_shim==1', {
2524 'dependencies': [ 2496 'dependencies': [
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
2611 # The sync_performance_tests do not run on mac without this flag. 2583 # The sync_performance_tests do not run on mac without this flag.
2612 # Search for comments about "xcode_settings" elsewhere in this file. 2584 # Search for comments about "xcode_settings" elsewhere in this file.
2613 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 2585 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
2614 # Dictionary sync is disabled on Mac. 2586 # Dictionary sync is disabled on Mac.
2615 'sources!': [ 2587 'sources!': [
2616 'browser/sync/test/integration/performance/dictionary_sync_perf_test .cc', 2588 'browser/sync/test/integration/performance/dictionary_sync_perf_test .cc',
2617 ], 2589 ],
2618 }], 2590 }],
2619 ['OS=="win"', { 2591 ['OS=="win"', {
2620 'sources': [ 2592 'sources': [
2621 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2622 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
2623 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2624 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
2625 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2593 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2626 ], 2594 ],
2627 'include_dirs': [ 2595 'include_dirs': [
2628 '<(DEPTH)/third_party/wtl/include', 2596 '<(DEPTH)/third_party/wtl/include',
2629 ], 2597 ],
2630 'dependencies': [ 2598 'dependencies': [
2631 'chrome_version_resources', 2599 'chrome_version_resources',
2632 ], 2600 ],
2633 'conditions': [ 2601 'conditions': [
2634 ['win_use_allocator_shim==1', { 2602 ['win_use_allocator_shim==1', {
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
3117 'utility', 3085 'utility',
3118 ], 3086 ],
3119 'sources': [ 3087 'sources': [
3120 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3088 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3121 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3089 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3122 ], 3090 ],
3123 }] 3091 }]
3124 }], 3092 }],
3125 ], # 'conditions' 3093 ], # 'conditions'
3126 } 3094 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698