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

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
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 1592 matching lines...) Expand 10 before | Expand all | Expand 10 after
2203 'convert_dict_lib', 2203 'convert_dict_lib',
2204 'packed_extra_resources', 2204 'packed_extra_resources',
2205 '../third_party/hunspell/hunspell.gyp:hunspell', 2205 '../third_party/hunspell/hunspell.gyp:hunspell',
2206 ], 2206 ],
2207 'sources!': [ 2207 'sources!': [
2208 'browser/spellchecker_platform_engine_unittest.cc', 2208 'browser/spellchecker_platform_engine_unittest.cc',
2209 ], 2209 ],
2210 }], 2210 }],
2211 ['OS=="win"', { 2211 ['OS=="win"', {
2212 'dependencies': [ 2212 'dependencies': [
2213 'chrome_dll_version', 2213 'chrome_version_resources',
2214 'installer_util_strings', 2214 'installer_util_strings',
2215 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 2215 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
2216 '../third_party/isimpledom/isimpledom.gyp:isimpledom', 2216 '../third_party/isimpledom/isimpledom.gyp:isimpledom',
2217 ], 2217 ],
2218 'conditions': [ 2218 'conditions': [
2219 ['win_use_allocator_shim==1', { 2219 ['win_use_allocator_shim==1', {
2220 'dependencies': [ 2220 'dependencies': [
2221 '<(allocator_target)', 2221 '<(allocator_target)',
2222 ], 2222 ],
2223 }], 2223 }],
2224 ], 2224 ],
2225 'include_dirs': [ 2225 'include_dirs': [
2226 '<(DEPTH)/third_party/wtl/include', 2226 '<(DEPTH)/third_party/wtl/include',
2227 ], 2227 ],
2228 'sources': [ 2228 'sources': [
2229 # TODO: It would be nice to have these pulled in 2229 # TODO: It would be nice to have these pulled in
2230 # automatically from direct_dependent_settings in 2230 # automatically from direct_dependent_settings in
2231 # their various targets (net.gyp:net_resources, etc.), 2231 # their various targets (net.gyp:net_resources, etc.),
2232 # but that causes errors in other targets when 2232 # but that causes errors in other targets when
2233 # resulting .res files get referenced multiple times. 2233 # resulting .res files get referenced multiple times.
2234 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', 2234 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
2235 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 2235 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2236 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 2236 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2237 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 2237 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
2238 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 2238 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
2239 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 2239 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
2240 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ', 2240 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2241 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 2241 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
2242 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 2242 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
2243 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 2243 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
2244 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 2244 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
2245 ], 2245 ],
2246 'link_settings': { 2246 'link_settings': {
2247 'libraries': [ 2247 'libraries': [
2248 '-lcomsupp.lib', 2248 '-lcomsupp.lib',
2249 '-loleacc.lib', 2249 '-loleacc.lib',
2250 '-lrpcrt4.lib', 2250 '-lrpcrt4.lib',
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
2341 ], 2341 ],
2342 'include_dirs': [ 2342 'include_dirs': [
2343 '..', 2343 '..',
2344 ], 2344 ],
2345 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ], 2345 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
2346 'sources': [ 2346 'sources': [
2347 'app/breakpad_mac_stubs.mm', 2347 'app/breakpad_mac_stubs.mm',
2348 'app/chrome_command_ids.h', 2348 'app/chrome_command_ids.h',
2349 'app/chrome_dll.rc', 2349 'app/chrome_dll.rc',
2350 'app/chrome_dll_resource.h', 2350 'app/chrome_dll_resource.h',
2351 'app/chrome_dll_version.rc.version', 2351 'app/chrome_version.rc.version',
2352 'browser/accessibility/renderer_accessibility_browsertest.cc', 2352 'browser/accessibility/renderer_accessibility_browsertest.cc',
2353 'browser/autocomplete/autocomplete_browsertest.cc', 2353 'browser/autocomplete/autocomplete_browsertest.cc',
2354 'browser/autofill/form_structure_browsertest.cc', 2354 'browser/autofill/form_structure_browsertest.cc',
2355 'browser/automation/automation_tab_helper_browsertest.cc', 2355 'browser/automation/automation_tab_helper_browsertest.cc',
2356 'browser/browser_browsertest.cc', 2356 'browser/browser_browsertest.cc',
2357 'browser/browsing_data_database_helper_browsertest.cc', 2357 'browser/browsing_data_database_helper_browsertest.cc',
2358 'browser/browsing_data_helper_browsertest.h', 2358 'browser/browsing_data_helper_browsertest.h',
2359 'browser/browsing_data_indexed_db_helper_browsertest.cc', 2359 'browser/browsing_data_indexed_db_helper_browsertest.cc',
2360 'browser/browsing_data_local_storage_helper_browsertest.cc', 2360 'browser/browsing_data_local_storage_helper_browsertest.cc',
2361 'browser/chromeos/cros/cros_in_process_browser_test.cc', 2361 'browser/chromeos/cros/cros_in_process_browser_test.cc',
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
2652 ], 2652 ],
2653 }], 2653 }],
2654 ['OS=="win"', { 2654 ['OS=="win"', {
2655 'sources': [ 2655 'sources': [
2656 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', 2656 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
2657 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 2657 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2658 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 2658 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2659 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 2659 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
2660 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 2660 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
2661 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 2661 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
2662 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ', 2662 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2663 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 2663 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
2664 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 2664 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
2665 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 2665 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
2666 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 2666 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
2667 # TODO(alekseys): port sidebar to linux/mac. 2667 # TODO(alekseys): port sidebar to linux/mac.
2668 'browser/sidebar/sidebar_browsertest.cc', 2668 'browser/sidebar/sidebar_browsertest.cc',
2669 ], 2669 ],
2670 'include_dirs': [ 2670 'include_dirs': [
2671 '<(DEPTH)/third_party/wtl/include', 2671 '<(DEPTH)/third_party/wtl/include',
2672 ], 2672 ],
2673 'dependencies': [ 2673 'dependencies': [
2674 'chrome_dll_version', 2674 'chrome_version_resources',
2675 'installer_util_strings', 2675 'installer_util_strings',
2676 '../sandbox/sandbox.gyp:sandbox', 2676 '../sandbox/sandbox.gyp:sandbox',
2677 ], 2677 ],
2678 'conditions': [ 2678 'conditions': [
2679 ['win_use_allocator_shim==1', { 2679 ['win_use_allocator_shim==1', {
2680 'dependencies': [ 2680 'dependencies': [
2681 '<(allocator_target)', 2681 '<(allocator_target)',
2682 ], 2682 ],
2683 }], 2683 }],
2684 ], 2684 ],
2685 'configurations': { 2685 'configurations': {
2686 'Debug_Base': { 2686 'Debug_Base': {
2687 'msvs_settings': { 2687 'msvs_settings': {
2688 'VCLinkerTool': { 2688 'VCLinkerTool': {
2689 'LinkIncremental': '<(msvs_debug_link_nonincremental)', 2689 'LinkIncremental': '<(msvs_debug_link_nonincremental)',
2690 }, 2690 },
2691 }, 2691 },
2692 }, 2692 },
2693 } 2693 }
2694 }, { # else: OS != "win" 2694 }, { # else: OS != "win"
2695 'sources!': [ 2695 'sources!': [
2696 'app/chrome_command_ids.h', 2696 'app/chrome_command_ids.h',
2697 'app/chrome_dll.rc', 2697 'app/chrome_dll.rc',
2698 'app/chrome_dll_resource.h', 2698 'app/chrome_dll_resource.h',
2699 'app/chrome_dll_version.rc.version', 2699 'app/chrome_version.rc.version',
2700 'browser/extensions/extension_rlz_apitest.cc', 2700 'browser/extensions/extension_rlz_apitest.cc',
2701 # http://crbug.com/15101 These tests fail on Linux and Mac. 2701 # http://crbug.com/15101 These tests fail on Linux and Mac.
2702 'browser/renderer_host/web_cache_manager_browsertest.cc', 2702 'browser/renderer_host/web_cache_manager_browsertest.cc',
2703 '../content/browser/child_process_security_policy_browsertest.cc', 2703 '../content/browser/child_process_security_policy_browsertest.cc',
2704 ], 2704 ],
2705 }], 2705 }],
2706 ['toolkit_uses_gtk == 1', { 2706 ['toolkit_uses_gtk == 1', {
2707 'dependencies': [ 2707 'dependencies': [
2708 '../build/linux/system.gyp:gtk', 2708 '../build/linux/system.gyp:gtk',
2709 '../build/linux/system.gyp:ssl', 2709 '../build/linux/system.gyp:ssl',
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
2827 'test/out_of_proc_test_runner.cc', 2827 'test/out_of_proc_test_runner.cc',
2828 ], 2828 ],
2829 'conditions': [ 2829 'conditions': [
2830 ['safe_browsing==0', { 2830 ['safe_browsing==0', {
2831 'sources!': [ 2831 'sources!': [
2832 'browser/safe_browsing/safe_browsing_test.cc', 2832 'browser/safe_browsing/safe_browsing_test.cc',
2833 ], 2833 ],
2834 }], 2834 }],
2835 ['OS=="win"', { 2835 ['OS=="win"', {
2836 'dependencies': [ 2836 'dependencies': [
2837 'chrome_dll_version', 2837 'chrome_version_resources',
2838 'installer_util_strings', 2838 'installer_util_strings',
2839 '../sandbox/sandbox.gyp:sandbox', 2839 '../sandbox/sandbox.gyp:sandbox',
2840 ], 2840 ],
2841 'sources': [ 2841 'sources': [
2842 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', 2842 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
2843 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 2843 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2844 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 2844 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2845 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 2845 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
2846 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 2846 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
2847 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 2847 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
2848 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ', 2848 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2849 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 2849 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
2850 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 2850 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
2851 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 2851 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
2852 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 2852 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
2853 ], 2853 ],
2854 'configurations': { 2854 'configurations': {
2855 'Debug_Base': { 2855 'Debug_Base': {
2856 'msvs_settings': { 2856 'msvs_settings': {
2857 'VCLinkerTool': { 2857 'VCLinkerTool': {
2858 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 2858 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
3425 '..', 3425 '..',
3426 '<(INTERMEDIATE_DIR)', 3426 '<(INTERMEDIATE_DIR)',
3427 '<(protoc_out_dir)', 3427 '<(protoc_out_dir)',
3428 ], 3428 ],
3429 # TODO(phajdan.jr): Only temporary, to make transition easier. 3429 # TODO(phajdan.jr): Only temporary, to make transition easier.
3430 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ], 3430 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
3431 'sources': [ 3431 'sources': [
3432 'app/chrome_command_ids.h', 3432 'app/chrome_command_ids.h',
3433 'app/chrome_dll.rc', 3433 'app/chrome_dll.rc',
3434 'app/chrome_dll_resource.h', 3434 'app/chrome_dll_resource.h',
3435 'app/chrome_dll_version.rc.version', 3435 'app/chrome_version.rc.version',
3436 'browser/password_manager/password_form_data.cc', 3436 'browser/password_manager/password_form_data.cc',
3437 'browser/sessions/session_backend.cc', 3437 'browser/sessions/session_backend.cc',
3438 'browser/sync/glue/session_model_associator.cc', 3438 'browser/sync/glue/session_model_associator.cc',
3439 'test/out_of_proc_test_runner.cc', 3439 'test/out_of_proc_test_runner.cc',
3440 'test/live_sync/bookmark_model_verifier.cc', 3440 'test/live_sync/bookmark_model_verifier.cc',
3441 'test/live_sync/bookmark_model_verifier.h', 3441 'test/live_sync/bookmark_model_verifier.h',
3442 'test/live_sync/live_apps_sync_test.cc', 3442 'test/live_sync/live_apps_sync_test.cc',
3443 'test/live_sync/live_apps_sync_test.h', 3443 'test/live_sync/live_apps_sync_test.h',
3444 'test/live_sync/live_autofill_sync_test.cc', 3444 'test/live_sync/live_autofill_sync_test.cc',
3445 'test/live_sync/live_autofill_sync_test.h', 3445 'test/live_sync/live_autofill_sync_test.h',
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
3518 # Search for comments about "xcode_settings" elsewhere in this file. 3518 # Search for comments about "xcode_settings" elsewhere in this file.
3519 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 3519 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
3520 }], 3520 }],
3521 ['OS=="win"', { 3521 ['OS=="win"', {
3522 'sources': [ 3522 'sources': [
3523 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', 3523 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
3524 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3524 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3525 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3525 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3526 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 3526 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
3527 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 3527 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
3528 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ', 3528 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
3529 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 3529 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
3530 ], 3530 ],
3531 'include_dirs': [ 3531 'include_dirs': [
3532 '<(DEPTH)/third_party/wtl/include', 3532 '<(DEPTH)/third_party/wtl/include',
3533 ], 3533 ],
3534 'dependencies': [ 3534 'dependencies': [
3535 'chrome_dll_version', 3535 'chrome_version_resources',
3536 'installer_util_strings', 3536 'installer_util_strings',
3537 '../sandbox/sandbox.gyp:sandbox', 3537 '../sandbox/sandbox.gyp:sandbox',
3538 ], 3538 ],
3539 'conditions': [ 3539 'conditions': [
3540 ['win_use_allocator_shim==1', { 3540 ['win_use_allocator_shim==1', {
3541 'dependencies': [ 3541 'dependencies': [
3542 '<(allocator_target)', 3542 '<(allocator_target)',
3543 ], 3543 ],
3544 }], 3544 }],
3545 ], 3545 ],
3546 'configurations': { 3546 'configurations': {
3547 'Debug': { 3547 'Debug': {
3548 'msvs_settings': { 3548 'msvs_settings': {
3549 'VCLinkerTool': { 3549 'VCLinkerTool': {
3550 'LinkIncremental': '<(msvs_debug_link_nonincremental)', 3550 'LinkIncremental': '<(msvs_debug_link_nonincremental)',
3551 }, 3551 },
3552 }, 3552 },
3553 }, 3553 },
3554 }, 3554 },
3555 }, { # else: OS != "win" 3555 }, { # else: OS != "win"
3556 'sources!': [ 3556 'sources!': [
3557 'app/chrome_dll.rc', 3557 'app/chrome_dll.rc',
3558 'app/chrome_dll_version.rc.version', 3558 'app/chrome_version.rc.version',
3559 'test/data/resource.rc', 3559 'test/data/resource.rc',
3560 ], 3560 ],
3561 }], 3561 }],
3562 ['toolkit_views==1', { 3562 ['toolkit_views==1', {
3563 'dependencies': [ 3563 'dependencies': [
3564 '../views/views.gyp:views', 3564 '../views/views.gyp:views',
3565 ], 3565 ],
3566 }], 3566 }],
3567 ], 3567 ],
3568 }, 3568 },
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
3621 'action': [ 3621 'action': [
3622 'python', 3622 'python',
3623 'test/gpu/generate_webgl_conformance_test_list.py', 3623 'test/gpu/generate_webgl_conformance_test_list.py',
3624 '<(test_list_out_dir)/webgl_conformance_test_list_autogen.h', 3624 '<(test_list_out_dir)/webgl_conformance_test_list_autogen.h',
3625 ], 3625 ],
3626 }, 3626 },
3627 ], 3627 ],
3628 'conditions': [ 3628 'conditions': [
3629 ['OS=="win"', { 3629 ['OS=="win"', {
3630 'dependencies': [ 3630 'dependencies': [
3631 'chrome_dll_version', 3631 'chrome_version_resources',
3632 'installer_util_strings', 3632 'installer_util_strings',
3633 '../sandbox/sandbox.gyp:sandbox', 3633 '../sandbox/sandbox.gyp:sandbox',
3634 ], 3634 ],
3635 'include_dirs': [ 3635 'include_dirs': [
3636 '<(DEPTH)/third_party/wtl/include', 3636 '<(DEPTH)/third_party/wtl/include',
3637 ], 3637 ],
3638 'sources': [ 3638 'sources': [
3639 'app/chrome_dll.rc', 3639 'app/chrome_dll.rc',
3640 'app/chrome_dll_resource.h', 3640 'app/chrome_dll_resource.h',
3641 'app/chrome_dll_version.rc.version', 3641 'app/chrome_version.rc.version',
3642 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', 3642 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
3643 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3643 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3644 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3644 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3645 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 3645 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
3646 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 3646 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
3647 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 3647 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
3648 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ', 3648 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
3649 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 3649 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
3650 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 3650 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
3651 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 3651 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
3652 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 3652 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
3653 ], 3653 ],
3654 'conditions': [ 3654 'conditions': [
3655 ['win_use_allocator_shim==1', { 3655 ['win_use_allocator_shim==1', {
3656 'dependencies': [ 3656 'dependencies': [
3657 '<(allocator_target)', 3657 '<(allocator_target)',
3658 ], 3658 ],
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
4202 # Use outputs of this action as inputs for the main target build. 4202 # Use outputs of this action as inputs for the main target build.
4203 # Seems as a misnomer but makes this happy on Linux (scons). 4203 # Seems as a misnomer but makes this happy on Linux (scons).
4204 'process_outputs_as_sources': 1, 4204 'process_outputs_as_sources': 1,
4205 }, 4205 },
4206 ], # 'actions' 4206 ], # 'actions'
4207 }, 4207 },
4208 ] 4208 ]
4209 }], # 'coverage!=0' 4209 }], # 'coverage!=0'
4210 ], # 'conditions' 4210 ], # 'conditions'
4211 } 4211 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698