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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 10694170: Renamed .pak and .rc files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Whitespace error (Attempt 2) Created 8 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_resources.gyp ('k') | chrome/installer/mini_installer/chrome.release » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'pyautolib_sources': [ 6 'pyautolib_sources': [
7 'app/chrome_command_ids.h', 7 'app/chrome_command_ids.h',
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/automation_constants.h', 9 'common/automation_constants.h',
10 'common/pref_names.cc', 10 'common/pref_names.cc',
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 641
642 # TODO: It would be nice to have these pulled in 642 # TODO: It would be nice to have these pulled in
643 # automatically from direct_dependent_settings in 643 # automatically from direct_dependent_settings in
644 # their various targets (net.gyp:net_resources, etc.), 644 # their various targets (net.gyp:net_resources, etc.),
645 # but that causes errors in other targets when 645 # but that causes errors in other targets when
646 # resulting .res files get referenced multiple times. 646 # resulting .res files get referenced multiple times.
647 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 647 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
648 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 648 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
649 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 649 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
650 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 650 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
651 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 651 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
652 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 652 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
653 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 653 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
654 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 654 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
655 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc ', 655 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent .rc',
656 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 656 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
657 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 657 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
658 658
659 'browser/accessibility/accessibility_win_browsertest.cc', 659 'browser/accessibility/accessibility_win_browsertest.cc',
660 'browser/ui/views/accessibility/browser_views_accessibility_browsert est.cc', 660 'browser/ui/views/accessibility/browser_views_accessibility_browsert est.cc',
661 ], 661 ],
662 'conditions': [ 662 'conditions': [
663 ['win_use_allocator_shim==1', { 663 ['win_use_allocator_shim==1', {
664 'dependencies': [ 664 'dependencies': [
665 '../base/allocator/allocator.gyp:allocator', 665 '../base/allocator/allocator.gyp:allocator',
(...skipping 1683 matching lines...) Expand 10 before | Expand all | Expand 10 after
2349 'sources': [ 2349 'sources': [
2350 # TODO: It would be nice to have these pulled in 2350 # TODO: It would be nice to have these pulled in
2351 # automatically from direct_dependent_settings in 2351 # automatically from direct_dependent_settings in
2352 # their various targets (net.gyp:net_resources, etc.), 2352 # their various targets (net.gyp:net_resources, etc.),
2353 # but that causes errors in other targets when 2353 # but that causes errors in other targets when
2354 # resulting .res files get referenced multiple times. 2354 # resulting .res files get referenced multiple times.
2355 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 2355 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2356 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 2356 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2357 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 2357 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
2358 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 2358 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
2359 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 2359 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
2360 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2360 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2361 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 2361 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
2362 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 2362 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
2363 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc ', 2363 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent .rc',
2364 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 2364 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
2365 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 2365 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
2366 ], 2366 ],
2367 'link_settings': { 2367 'link_settings': {
2368 'libraries': [ 2368 'libraries': [
2369 '-lcomsupp.lib', 2369 '-lcomsupp.lib',
2370 '-loleacc.lib', 2370 '-loleacc.lib',
2371 '-lrpcrt4.lib', 2371 '-lrpcrt4.lib',
2372 '-lurlmon.lib', 2372 '-lurlmon.lib',
2373 '-lwinmm.lib', 2373 '-lwinmm.lib',
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
3220 'sources!': [ 3220 'sources!': [
3221 'browser/rlz/rlz_extension_apitest.cc', 3221 'browser/rlz/rlz_extension_apitest.cc',
3222 ], 3222 ],
3223 }], 3223 }],
3224 ['OS=="win"', { 3224 ['OS=="win"', {
3225 'sources': [ 3225 'sources': [
3226 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3226 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3227 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3227 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3228 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 3228 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
3229 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 3229 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
3230 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 3230 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
3231 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 3231 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
3232 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 3232 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
3233 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 3233 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
3234 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc ', 3234 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent .rc',
3235 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 3235 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
3236 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 3236 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
3237 ], 3237 ],
3238 'include_dirs': [ 3238 'include_dirs': [
3239 '<(DEPTH)/third_party/wtl/include', 3239 '<(DEPTH)/third_party/wtl/include',
3240 ], 3240 ],
3241 'dependencies': [ 3241 'dependencies': [
3242 'chrome_version_resources', 3242 'chrome_version_resources',
3243 'security_tests', # run time dependency 3243 'security_tests', # run time dependency
3244 ], 3244 ],
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
3485 ], 3485 ],
3486 }, 3486 },
3487 ], 3487 ],
3488 'conditions': [ 3488 'conditions': [
3489 ['OS=="win"', { 3489 ['OS=="win"', {
3490 'sources': [ 3490 'sources': [
3491 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3491 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3492 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3492 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3493 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 3493 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
3494 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 3494 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
3495 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 3495 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
3496 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 3496 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
3497 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 3497 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
3498 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 3498 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
3499 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc ', 3499 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent .rc',
3500 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 3500 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
3501 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 3501 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
3502 ], 3502 ],
3503 'include_dirs': [ 3503 'include_dirs': [
3504 '<(DEPTH)/third_party/wtl/include', 3504 '<(DEPTH)/third_party/wtl/include',
3505 ], 3505 ],
3506 'dependencies': [ 3506 'dependencies': [
3507 'chrome_version_resources', 3507 'chrome_version_resources',
3508 ], 3508 ],
3509 'conditions': [ 3509 'conditions': [
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
3606 }], 3606 }],
3607 ['OS=="win"', { 3607 ['OS=="win"', {
3608 'dependencies': [ 3608 'dependencies': [
3609 'chrome_version_resources', 3609 'chrome_version_resources',
3610 ], 3610 ],
3611 'sources': [ 3611 'sources': [
3612 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3612 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3613 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3613 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3614 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 3614 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
3615 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 3615 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
3616 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 3616 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
3617 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 3617 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
3618 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 3618 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
3619 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 3619 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
3620 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc ', 3620 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent .rc',
3621 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 3621 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
3622 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 3622 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
3623 ], 3623 ],
3624 'configurations': { 3624 'configurations': {
3625 'Debug_Base': { 3625 'Debug_Base': {
3626 'msvs_settings': { 3626 'msvs_settings': {
3627 'VCLinkerTool': { 3627 'VCLinkerTool': {
3628 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 3628 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
3629 }, 3629 },
3630 }, 3630 },
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
3973 ['OS=="mac"', { 3973 ['OS=="mac"', {
3974 # The sync_integration_tests do not run on mac without this flag. 3974 # The sync_integration_tests do not run on mac without this flag.
3975 # Search for comments about "xcode_settings" elsewhere in this file. 3975 # Search for comments about "xcode_settings" elsewhere in this file.
3976 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 3976 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
3977 }], 3977 }],
3978 ['OS=="win"', { 3978 ['OS=="win"', {
3979 'sources': [ 3979 'sources': [
3980 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3980 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3981 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3981 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3982 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 3982 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
3983 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 3983 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
3984 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 3984 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
3985 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc ', 3985 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent .rc',
3986 ], 3986 ],
3987 'include_dirs': [ 3987 'include_dirs': [
3988 '<(DEPTH)/third_party/wtl/include', 3988 '<(DEPTH)/third_party/wtl/include',
3989 ], 3989 ],
3990 'dependencies': [ 3990 'dependencies': [
3991 'chrome_version_resources', 3991 'chrome_version_resources',
3992 ], 3992 ],
3993 'conditions': [ 3993 'conditions': [
3994 ['win_use_allocator_shim==1', { 3994 ['win_use_allocator_shim==1', {
3995 'dependencies': [ 3995 'dependencies': [
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
4092 ['OS=="mac"', { 4092 ['OS=="mac"', {
4093 # The sync_integration_tests do not run on mac without this flag. 4093 # The sync_integration_tests do not run on mac without this flag.
4094 # Search for comments about "xcode_settings" elsewhere in this file. 4094 # Search for comments about "xcode_settings" elsewhere in this file.
4095 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 4095 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
4096 }], 4096 }],
4097 ['OS=="win"', { 4097 ['OS=="win"', {
4098 'sources': [ 4098 'sources': [
4099 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 4099 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
4100 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 4100 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
4101 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 4101 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
4102 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 4102 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
4103 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 4103 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
4104 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc ', 4104 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent .rc',
4105 ], 4105 ],
4106 'include_dirs': [ 4106 'include_dirs': [
4107 '<(DEPTH)/third_party/wtl/include', 4107 '<(DEPTH)/third_party/wtl/include',
4108 ], 4108 ],
4109 'dependencies': [ 4109 'dependencies': [
4110 'chrome_version_resources', 4110 'chrome_version_resources',
4111 ], 4111 ],
4112 'conditions': [ 4112 'conditions': [
4113 ['win_use_allocator_shim==1', { 4113 ['win_use_allocator_shim==1', {
4114 'dependencies': [ 4114 'dependencies': [
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
4695 'input_jars_paths': [ 4695 'input_jars_paths': [
4696 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', 4696 '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
4697 ], 4697 ],
4698 }, 4698 },
4699 'includes': [ '../build/apk_test.gypi' ], 4699 'includes': [ '../build/apk_test.gypi' ],
4700 }, 4700 },
4701 ], 4701 ],
4702 }], 4702 }],
4703 ], # 'conditions' 4703 ], # 'conditions'
4704 } 4704 }
OLDNEW
« no previous file with comments | « chrome/chrome_resources.gyp ('k') | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698