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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 7390037: Generating separate version resources for: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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 | « chrome/chrome_exe.gypi ('k') | chrome_frame/chrome_frame.gyp » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'pyautolib_sources': [ 7 'pyautolib_sources': [
8 'app/chrome_command_ids.h', 8 'app/chrome_command_ids.h',
9 'app/chrome_dll_resource.h', 9 'app/chrome_dll_resource.h',
10 'common/automation_constants.h', 10 'common/automation_constants.h',
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 ['toolkit_views==1', { 558 ['toolkit_views==1', {
559 'dependencies': [ 559 'dependencies': [
560 '../views/views.gyp:views', 560 '../views/views.gyp:views',
561 ], 561 ],
562 }], 562 }],
563 ['OS=="win"', { 563 ['OS=="win"', {
564 'include_dirs': [ 564 'include_dirs': [
565 '../third_party/wtl/include', 565 '../third_party/wtl/include',
566 ], 566 ],
567 'dependencies': [ 567 'dependencies': [
568 'chrome.gyp:chrome_dll_version', 568 'chrome.gyp:chrome_version_resources',
569 'chrome.gyp:installer_util_strings', 569 'chrome.gyp:installer_util_strings',
570 '../sandbox/sandbox.gyp:sandbox', 570 '../sandbox/sandbox.gyp:sandbox',
571 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 571 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
572 '../third_party/isimpledom/isimpledom.gyp:isimpledom', 572 '../third_party/isimpledom/isimpledom.gyp:isimpledom',
573 '../ui/ui.gyp:ui_resources', 573 '../ui/ui.gyp:ui_resources',
574 ], 574 ],
575 'sources': [ 575 'sources': [
576 '../webkit/glue/resources/aliasb.cur', 576 '../webkit/glue/resources/aliasb.cur',
577 '../webkit/glue/resources/cell.cur', 577 '../webkit/glue/resources/cell.cur',
578 '../webkit/glue/resources/col_resize.cur', 578 '../webkit/glue/resources/col_resize.cur',
(...skipping 11 matching lines...) Expand all
590 # automatically from direct_dependent_settings in 590 # automatically from direct_dependent_settings in
591 # their various targets (net.gyp:net_resources, etc.), 591 # their various targets (net.gyp:net_resources, etc.),
592 # but that causes errors in other targets when 592 # but that causes errors in other targets when
593 # resulting .res files get referenced multiple times. 593 # resulting .res files get referenced multiple times.
594 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', 594 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
595 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 595 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
596 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 596 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
597 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 597 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
598 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 598 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
599 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 599 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
600 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ', 600 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
601 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 601 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
602 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 602 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
603 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 603 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
604 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 604 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
605 605
606 'browser/accessibility/accessibility_win_browsertest.cc', 606 'browser/accessibility/accessibility_win_browsertest.cc',
607 'browser/accessibility/browser_views_accessibility_browsertest.cc', 607 'browser/accessibility/browser_views_accessibility_browsertest.cc',
608 ], 608 ],
609 'conditions': [ 609 'conditions': [
610 ['win_use_allocator_shim==1', { 610 ['win_use_allocator_shim==1', {
(...skipping 1611 matching lines...) Expand 10 before | Expand all | Expand 10 after
2222 'convert_dict_lib', 2222 'convert_dict_lib',
2223 'packed_extra_resources', 2223 'packed_extra_resources',
2224 '../third_party/hunspell/hunspell.gyp:hunspell', 2224 '../third_party/hunspell/hunspell.gyp:hunspell',
2225 ], 2225 ],
2226 'sources!': [ 2226 'sources!': [
2227 'browser/spellchecker_platform_engine_unittest.cc', 2227 'browser/spellchecker_platform_engine_unittest.cc',
2228 ], 2228 ],
2229 }], 2229 }],
2230 ['OS=="win"', { 2230 ['OS=="win"', {
2231 'dependencies': [ 2231 'dependencies': [
2232 'chrome_dll_version', 2232 'chrome_version_resources',
2233 'installer_util_strings', 2233 'installer_util_strings',
2234 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 2234 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
2235 '../third_party/isimpledom/isimpledom.gyp:isimpledom', 2235 '../third_party/isimpledom/isimpledom.gyp:isimpledom',
2236 ], 2236 ],
2237 'conditions': [ 2237 'conditions': [
2238 ['win_use_allocator_shim==1', { 2238 ['win_use_allocator_shim==1', {
2239 'dependencies': [ 2239 'dependencies': [
2240 '<(allocator_target)', 2240 '<(allocator_target)',
2241 ], 2241 ],
2242 }], 2242 }],
2243 ], 2243 ],
2244 'include_dirs': [ 2244 'include_dirs': [
2245 '<(DEPTH)/third_party/wtl/include', 2245 '<(DEPTH)/third_party/wtl/include',
2246 ], 2246 ],
2247 'sources': [ 2247 'sources': [
2248 # TODO: It would be nice to have these pulled in 2248 # TODO: It would be nice to have these pulled in
2249 # automatically from direct_dependent_settings in 2249 # automatically from direct_dependent_settings in
2250 # their various targets (net.gyp:net_resources, etc.), 2250 # their various targets (net.gyp:net_resources, etc.),
2251 # but that causes errors in other targets when 2251 # but that causes errors in other targets when
2252 # resulting .res files get referenced multiple times. 2252 # resulting .res files get referenced multiple times.
2253 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', 2253 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
2254 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 2254 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2255 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 2255 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2256 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 2256 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
2257 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 2257 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
2258 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 2258 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
2259 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ', 2259 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2260 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 2260 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
2261 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 2261 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
2262 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 2262 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
2263 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 2263 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
2264 ], 2264 ],
2265 'link_settings': { 2265 'link_settings': {
2266 'libraries': [ 2266 'libraries': [
2267 '-lcomsupp.lib', 2267 '-lcomsupp.lib',
2268 '-loleacc.lib', 2268 '-loleacc.lib',
2269 '-lrpcrt4.lib', 2269 '-lrpcrt4.lib',
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
2360 ], 2360 ],
2361 'include_dirs': [ 2361 'include_dirs': [
2362 '..', 2362 '..',
2363 ], 2363 ],
2364 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ], 2364 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
2365 'sources': [ 2365 'sources': [
2366 'app/breakpad_mac_stubs.mm', 2366 'app/breakpad_mac_stubs.mm',
2367 'app/chrome_command_ids.h', 2367 'app/chrome_command_ids.h',
2368 'app/chrome_dll.rc', 2368 'app/chrome_dll.rc',
2369 'app/chrome_dll_resource.h', 2369 'app/chrome_dll_resource.h',
2370 'app/chrome_dll_version.rc.version', 2370 'app/chrome_version.rc.version',
2371 'browser/accessibility/renderer_accessibility_browsertest.cc', 2371 'browser/accessibility/renderer_accessibility_browsertest.cc',
2372 'browser/autocomplete/autocomplete_browsertest.cc', 2372 'browser/autocomplete/autocomplete_browsertest.cc',
2373 'browser/autofill/form_structure_browsertest.cc', 2373 'browser/autofill/form_structure_browsertest.cc',
2374 'browser/automation/automation_tab_helper_browsertest.cc', 2374 'browser/automation/automation_tab_helper_browsertest.cc',
2375 'browser/browser_browsertest.cc', 2375 'browser/browser_browsertest.cc',
2376 'browser/browsing_data_database_helper_browsertest.cc', 2376 'browser/browsing_data_database_helper_browsertest.cc',
2377 'browser/browsing_data_helper_browsertest.h', 2377 'browser/browsing_data_helper_browsertest.h',
2378 'browser/browsing_data_indexed_db_helper_browsertest.cc', 2378 'browser/browsing_data_indexed_db_helper_browsertest.cc',
2379 'browser/browsing_data_local_storage_helper_browsertest.cc', 2379 'browser/browsing_data_local_storage_helper_browsertest.cc',
2380 'browser/chromeos/cros/cros_in_process_browser_test.cc', 2380 'browser/chromeos/cros/cros_in_process_browser_test.cc',
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
2671 ], 2671 ],
2672 }], 2672 }],
2673 ['OS=="win"', { 2673 ['OS=="win"', {
2674 'sources': [ 2674 'sources': [
2675 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', 2675 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
2676 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 2676 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2677 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 2677 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2678 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 2678 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
2679 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 2679 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
2680 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 2680 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
2681 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ', 2681 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2682 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 2682 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
2683 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 2683 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
2684 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 2684 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
2685 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 2685 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
2686 # TODO(alekseys): port sidebar to linux/mac. 2686 # TODO(alekseys): port sidebar to linux/mac.
2687 'browser/sidebar/sidebar_browsertest.cc', 2687 'browser/sidebar/sidebar_browsertest.cc',
2688 ], 2688 ],
2689 'include_dirs': [ 2689 'include_dirs': [
2690 '<(DEPTH)/third_party/wtl/include', 2690 '<(DEPTH)/third_party/wtl/include',
2691 ], 2691 ],
2692 'dependencies': [ 2692 'dependencies': [
2693 'chrome_dll_version', 2693 'chrome_version_resources',
2694 'installer_util_strings', 2694 'installer_util_strings',
2695 '../sandbox/sandbox.gyp:sandbox', 2695 '../sandbox/sandbox.gyp:sandbox',
2696 ], 2696 ],
2697 'conditions': [ 2697 'conditions': [
2698 ['win_use_allocator_shim==1', { 2698 ['win_use_allocator_shim==1', {
2699 'dependencies': [ 2699 'dependencies': [
2700 '<(allocator_target)', 2700 '<(allocator_target)',
2701 ], 2701 ],
2702 }], 2702 }],
2703 ], 2703 ],
2704 'configurations': { 2704 'configurations': {
2705 'Debug_Base': { 2705 'Debug_Base': {
2706 'msvs_settings': { 2706 'msvs_settings': {
2707 'VCLinkerTool': { 2707 'VCLinkerTool': {
2708 'LinkIncremental': '<(msvs_debug_link_nonincremental)', 2708 'LinkIncremental': '<(msvs_debug_link_nonincremental)',
2709 }, 2709 },
2710 }, 2710 },
2711 }, 2711 },
2712 } 2712 }
2713 }, { # else: OS != "win" 2713 }, { # else: OS != "win"
2714 'sources!': [ 2714 'sources!': [
2715 'app/chrome_command_ids.h', 2715 'app/chrome_command_ids.h',
2716 'app/chrome_dll.rc', 2716 'app/chrome_dll.rc',
2717 'app/chrome_dll_resource.h', 2717 'app/chrome_dll_resource.h',
2718 'app/chrome_dll_version.rc.version', 2718 'app/chrome_version.rc.version',
2719 'browser/extensions/extension_rlz_apitest.cc', 2719 'browser/extensions/extension_rlz_apitest.cc',
2720 # http://crbug.com/15101 These tests fail on Linux and Mac. 2720 # http://crbug.com/15101 These tests fail on Linux and Mac.
2721 'browser/renderer_host/web_cache_manager_browsertest.cc', 2721 'browser/renderer_host/web_cache_manager_browsertest.cc',
2722 '../content/browser/child_process_security_policy_browsertest.cc', 2722 '../content/browser/child_process_security_policy_browsertest.cc',
2723 ], 2723 ],
2724 }], 2724 }],
2725 ['toolkit_uses_gtk == 1', { 2725 ['toolkit_uses_gtk == 1', {
2726 'dependencies': [ 2726 'dependencies': [
2727 '../build/linux/system.gyp:gtk', 2727 '../build/linux/system.gyp:gtk',
2728 '../build/linux/system.gyp:ssl', 2728 '../build/linux/system.gyp:ssl',
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
2846 'test/out_of_proc_test_runner.cc', 2846 'test/out_of_proc_test_runner.cc',
2847 ], 2847 ],
2848 'conditions': [ 2848 'conditions': [
2849 ['safe_browsing==0', { 2849 ['safe_browsing==0', {
2850 'sources!': [ 2850 'sources!': [
2851 'browser/safe_browsing/safe_browsing_test.cc', 2851 'browser/safe_browsing/safe_browsing_test.cc',
2852 ], 2852 ],
2853 }], 2853 }],
2854 ['OS=="win"', { 2854 ['OS=="win"', {
2855 'dependencies': [ 2855 'dependencies': [
2856 'chrome_dll_version', 2856 'chrome_version_resources',
2857 'installer_util_strings', 2857 'installer_util_strings',
2858 '../sandbox/sandbox.gyp:sandbox', 2858 '../sandbox/sandbox.gyp:sandbox',
2859 ], 2859 ],
2860 'sources': [ 2860 'sources': [
2861 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', 2861 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
2862 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 2862 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2863 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 2863 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2864 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 2864 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
2865 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 2865 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
2866 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 2866 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
2867 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ', 2867 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2868 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 2868 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
2869 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 2869 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
2870 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 2870 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
2871 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 2871 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
2872 ], 2872 ],
2873 'configurations': { 2873 'configurations': {
2874 'Debug_Base': { 2874 'Debug_Base': {
2875 'msvs_settings': { 2875 'msvs_settings': {
2876 'VCLinkerTool': { 2876 'VCLinkerTool': {
2877 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 2877 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
3444 '..', 3444 '..',
3445 '<(INTERMEDIATE_DIR)', 3445 '<(INTERMEDIATE_DIR)',
3446 '<(protoc_out_dir)', 3446 '<(protoc_out_dir)',
3447 ], 3447 ],
3448 # TODO(phajdan.jr): Only temporary, to make transition easier. 3448 # TODO(phajdan.jr): Only temporary, to make transition easier.
3449 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ], 3449 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
3450 'sources': [ 3450 'sources': [
3451 'app/chrome_command_ids.h', 3451 'app/chrome_command_ids.h',
3452 'app/chrome_dll.rc', 3452 'app/chrome_dll.rc',
3453 'app/chrome_dll_resource.h', 3453 'app/chrome_dll_resource.h',
3454 'app/chrome_dll_version.rc.version', 3454 'app/chrome_version.rc.version',
3455 'browser/password_manager/password_form_data.cc', 3455 'browser/password_manager/password_form_data.cc',
3456 'browser/sessions/session_backend.cc', 3456 'browser/sessions/session_backend.cc',
3457 'browser/sync/glue/session_model_associator.cc', 3457 'browser/sync/glue/session_model_associator.cc',
3458 'test/out_of_proc_test_runner.cc', 3458 'test/out_of_proc_test_runner.cc',
3459 'test/live_sync/bookmark_model_verifier.cc', 3459 'test/live_sync/bookmark_model_verifier.cc',
3460 'test/live_sync/bookmark_model_verifier.h', 3460 'test/live_sync/bookmark_model_verifier.h',
3461 'test/live_sync/live_apps_sync_test.cc', 3461 'test/live_sync/live_apps_sync_test.cc',
3462 'test/live_sync/live_apps_sync_test.h', 3462 'test/live_sync/live_apps_sync_test.h',
3463 'test/live_sync/live_autofill_sync_test.cc', 3463 'test/live_sync/live_autofill_sync_test.cc',
3464 'test/live_sync/live_autofill_sync_test.h', 3464 'test/live_sync/live_autofill_sync_test.h',
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
3537 # Search for comments about "xcode_settings" elsewhere in this file. 3537 # Search for comments about "xcode_settings" elsewhere in this file.
3538 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 3538 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
3539 }], 3539 }],
3540 ['OS=="win"', { 3540 ['OS=="win"', {
3541 'sources': [ 3541 'sources': [
3542 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', 3542 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
3543 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3543 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3544 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3544 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3545 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 3545 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
3546 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 3546 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
3547 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ', 3547 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
3548 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 3548 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
3549 ], 3549 ],
3550 'include_dirs': [ 3550 'include_dirs': [
3551 '<(DEPTH)/third_party/wtl/include', 3551 '<(DEPTH)/third_party/wtl/include',
3552 ], 3552 ],
3553 'dependencies': [ 3553 'dependencies': [
3554 'chrome_dll_version', 3554 'chrome_version_resources',
3555 'installer_util_strings', 3555 'installer_util_strings',
3556 '../sandbox/sandbox.gyp:sandbox', 3556 '../sandbox/sandbox.gyp:sandbox',
3557 ], 3557 ],
3558 'conditions': [ 3558 'conditions': [
3559 ['win_use_allocator_shim==1', { 3559 ['win_use_allocator_shim==1', {
3560 'dependencies': [ 3560 'dependencies': [
3561 '<(allocator_target)', 3561 '<(allocator_target)',
3562 ], 3562 ],
3563 }], 3563 }],
3564 ], 3564 ],
3565 'configurations': { 3565 'configurations': {
3566 'Debug': { 3566 'Debug': {
3567 'msvs_settings': { 3567 'msvs_settings': {
3568 'VCLinkerTool': { 3568 'VCLinkerTool': {
3569 'LinkIncremental': '<(msvs_debug_link_nonincremental)', 3569 'LinkIncremental': '<(msvs_debug_link_nonincremental)',
3570 }, 3570 },
3571 }, 3571 },
3572 }, 3572 },
3573 }, 3573 },
3574 }, { # else: OS != "win" 3574 }, { # else: OS != "win"
3575 'sources!': [ 3575 'sources!': [
3576 'app/chrome_dll.rc', 3576 'app/chrome_dll.rc',
3577 'app/chrome_dll_version.rc.version', 3577 'app/chrome_version.rc.version',
3578 'test/data/resource.rc', 3578 'test/data/resource.rc',
3579 ], 3579 ],
3580 }], 3580 }],
3581 ['toolkit_views==1', { 3581 ['toolkit_views==1', {
3582 'dependencies': [ 3582 'dependencies': [
3583 '../views/views.gyp:views', 3583 '../views/views.gyp:views',
3584 ], 3584 ],
3585 }], 3585 }],
3586 ], 3586 ],
3587 }, 3587 },
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
3640 'action': [ 3640 'action': [
3641 'python', 3641 'python',
3642 'test/gpu/generate_webgl_conformance_test_list.py', 3642 'test/gpu/generate_webgl_conformance_test_list.py',
3643 '<(test_list_out_dir)/webgl_conformance_test_list_autogen.h', 3643 '<(test_list_out_dir)/webgl_conformance_test_list_autogen.h',
3644 ], 3644 ],
3645 }, 3645 },
3646 ], 3646 ],
3647 'conditions': [ 3647 'conditions': [
3648 ['OS=="win"', { 3648 ['OS=="win"', {
3649 'dependencies': [ 3649 'dependencies': [
3650 'chrome_dll_version', 3650 'chrome_version_resources',
3651 'installer_util_strings', 3651 'installer_util_strings',
3652 '../sandbox/sandbox.gyp:sandbox', 3652 '../sandbox/sandbox.gyp:sandbox',
3653 ], 3653 ],
3654 'include_dirs': [ 3654 'include_dirs': [
3655 '<(DEPTH)/third_party/wtl/include', 3655 '<(DEPTH)/third_party/wtl/include',
3656 ], 3656 ],
3657 'sources': [ 3657 'sources': [
3658 'app/chrome_dll.rc', 3658 'app/chrome_dll.rc',
3659 'app/chrome_dll_resource.h', 3659 'app/chrome_dll_resource.h',
3660 'app/chrome_dll_version.rc.version', 3660 'app/chrome_version.rc.version',
3661 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', 3661 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
3662 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3662 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3663 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3663 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3664 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 3664 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
3665 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 3665 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
3666 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 3666 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
3667 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ', 3667 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
3668 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 3668 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
3669 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 3669 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
3670 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 3670 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
3671 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 3671 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
3672 ], 3672 ],
3673 'conditions': [ 3673 'conditions': [
3674 ['win_use_allocator_shim==1', { 3674 ['win_use_allocator_shim==1', {
3675 'dependencies': [ 3675 'dependencies': [
3676 '<(allocator_target)', 3676 '<(allocator_target)',
3677 ], 3677 ],
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
4221 # Use outputs of this action as inputs for the main target build. 4221 # Use outputs of this action as inputs for the main target build.
4222 # Seems as a misnomer but makes this happy on Linux (scons). 4222 # Seems as a misnomer but makes this happy on Linux (scons).
4223 'process_outputs_as_sources': 1, 4223 'process_outputs_as_sources': 1,
4224 }, 4224 },
4225 ], # 'actions' 4225 ], # 'actions'
4226 }, 4226 },
4227 ] 4227 ]
4228 }], # 'coverage!=0' 4228 }], # 'coverage!=0'
4229 ], # 'conditions' 4229 ], # 'conditions'
4230 } 4230 }
OLDNEW
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome_frame/chrome_frame.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698