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

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: 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
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 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 638
639 # TODO: It would be nice to have these pulled in 639 # TODO: It would be nice to have these pulled in
640 # automatically from direct_dependent_settings in 640 # automatically from direct_dependent_settings in
641 # their various targets (net.gyp:net_resources, etc.), 641 # their various targets (net.gyp:net_resources, etc.),
642 # but that causes errors in other targets when 642 # but that causes errors in other targets when
643 # resulting .res files get referenced multiple times. 643 # resulting .res files get referenced multiple times.
644 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 644 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
645 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 645 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
646 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 646 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
647 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 647 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
648 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 648 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
649 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 649 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
650 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 650 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
651 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 651 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
652 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc ', 652 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
653 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 653 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
654 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 654 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
655 655
656 'browser/accessibility/accessibility_win_browsertest.cc', 656 'browser/accessibility/accessibility_win_browsertest.cc',
657 'browser/ui/views/accessibility/browser_views_accessibility_browsert est.cc', 657 'browser/ui/views/accessibility/browser_views_accessibility_browsert est.cc',
658 ], 658 ],
659 'conditions': [ 659 'conditions': [
660 ['win_use_allocator_shim==1', { 660 ['win_use_allocator_shim==1', {
661 'dependencies': [ 661 'dependencies': [
662 '../base/allocator/allocator.gyp:allocator', 662 '../base/allocator/allocator.gyp:allocator',
(...skipping 1687 matching lines...) Expand 10 before | Expand all | Expand 10 after
2350 'sources': [ 2350 'sources': [
2351 # TODO: It would be nice to have these pulled in 2351 # TODO: It would be nice to have these pulled in
2352 # automatically from direct_dependent_settings in 2352 # automatically from direct_dependent_settings in
2353 # their various targets (net.gyp:net_resources, etc.), 2353 # their various targets (net.gyp:net_resources, etc.),
2354 # but that causes errors in other targets when 2354 # but that causes errors in other targets when
2355 # resulting .res files get referenced multiple times. 2355 # resulting .res files get referenced multiple times.
2356 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 2356 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2357 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 2357 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2358 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 2358 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
2359 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 2359 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
2360 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 2360 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
2361 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2361 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2362 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 2362 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
2363 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 2363 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
2364 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc ', 2364 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
2365 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 2365 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
2366 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 2366 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
2367 ], 2367 ],
2368 'link_settings': { 2368 'link_settings': {
2369 'libraries': [ 2369 'libraries': [
2370 '-lcomsupp.lib', 2370 '-lcomsupp.lib',
2371 '-loleacc.lib', 2371 '-loleacc.lib',
2372 '-lrpcrt4.lib', 2372 '-lrpcrt4.lib',
2373 '-lurlmon.lib', 2373 '-lurlmon.lib',
2374 '-lwinmm.lib', 2374 '-lwinmm.lib',
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after
3206 'sources!': [ 3206 'sources!': [
3207 'browser/rlz/rlz_extension_apitest.cc', 3207 'browser/rlz/rlz_extension_apitest.cc',
3208 ], 3208 ],
3209 }], 3209 }],
3210 ['OS=="win"', { 3210 ['OS=="win"', {
3211 'sources': [ 3211 'sources': [
3212 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3212 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3213 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3213 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3214 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 3214 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
3215 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 3215 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
3216 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 3216 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
3217 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 3217 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
3218 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 3218 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
3219 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 3219 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
3220 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc ', 3220 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
3221 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 3221 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
3222 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 3222 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
3223 ], 3223 ],
3224 'include_dirs': [ 3224 'include_dirs': [
3225 '<(DEPTH)/third_party/wtl/include', 3225 '<(DEPTH)/third_party/wtl/include',
3226 ], 3226 ],
3227 'dependencies': [ 3227 'dependencies': [
3228 'chrome_version_resources', 3228 'chrome_version_resources',
3229 'security_tests', # run time dependency 3229 'security_tests', # run time dependency
3230 ], 3230 ],
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
3472 ], 3472 ],
3473 }, 3473 },
3474 ], 3474 ],
3475 'conditions': [ 3475 'conditions': [
3476 ['OS=="win"', { 3476 ['OS=="win"', {
3477 'sources': [ 3477 'sources': [
3478 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3478 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3479 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3479 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3480 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 3480 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
3481 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 3481 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
3482 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 3482 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
3483 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 3483 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
3484 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 3484 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
3485 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 3485 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
3486 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc ', 3486 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
3487 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 3487 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
3488 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 3488 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
3489 ], 3489 ],
3490 'include_dirs': [ 3490 'include_dirs': [
3491 '<(DEPTH)/third_party/wtl/include', 3491 '<(DEPTH)/third_party/wtl/include',
3492 ], 3492 ],
3493 'dependencies': [ 3493 'dependencies': [
3494 'chrome_version_resources', 3494 'chrome_version_resources',
3495 ], 3495 ],
3496 'conditions': [ 3496 'conditions': [
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
3594 }], 3594 }],
3595 ['OS=="win"', { 3595 ['OS=="win"', {
3596 'dependencies': [ 3596 'dependencies': [
3597 'chrome_version_resources', 3597 'chrome_version_resources',
3598 ], 3598 ],
3599 'sources': [ 3599 'sources': [
3600 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3600 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3601 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3601 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3602 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 3602 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
3603 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 3603 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
3604 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 3604 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
3605 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 3605 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
3606 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 3606 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
3607 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 3607 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
3608 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc ', 3608 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
3609 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 3609 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
3610 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 3610 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
3611 ], 3611 ],
3612 'configurations': { 3612 'configurations': {
3613 'Debug_Base': { 3613 'Debug_Base': {
3614 'msvs_settings': { 3614 'msvs_settings': {
3615 'VCLinkerTool': { 3615 'VCLinkerTool': {
3616 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 3616 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
3617 }, 3617 },
3618 }, 3618 },
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
3961 ['OS=="mac"', { 3961 ['OS=="mac"', {
3962 # The sync_integration_tests do not run on mac without this flag. 3962 # The sync_integration_tests do not run on mac without this flag.
3963 # Search for comments about "xcode_settings" elsewhere in this file. 3963 # Search for comments about "xcode_settings" elsewhere in this file.
3964 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 3964 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
3965 }], 3965 }],
3966 ['OS=="win"', { 3966 ['OS=="win"', {
3967 'sources': [ 3967 'sources': [
3968 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3968 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3969 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3969 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3970 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 3970 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
3971 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 3971 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
3972 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 3972 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
3973 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc ', 3973 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
3974 ], 3974 ],
3975 'include_dirs': [ 3975 'include_dirs': [
3976 '<(DEPTH)/third_party/wtl/include', 3976 '<(DEPTH)/third_party/wtl/include',
3977 ], 3977 ],
3978 'dependencies': [ 3978 'dependencies': [
3979 'chrome_version_resources', 3979 'chrome_version_resources',
3980 ], 3980 ],
3981 'conditions': [ 3981 'conditions': [
3982 ['win_use_allocator_shim==1', { 3982 ['win_use_allocator_shim==1', {
3983 'dependencies': [ 3983 'dependencies': [
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
4080 ['OS=="mac"', { 4080 ['OS=="mac"', {
4081 # The sync_integration_tests do not run on mac without this flag. 4081 # The sync_integration_tests do not run on mac without this flag.
4082 # Search for comments about "xcode_settings" elsewhere in this file. 4082 # Search for comments about "xcode_settings" elsewhere in this file.
4083 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 4083 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
4084 }], 4084 }],
4085 ['OS=="win"', { 4085 ['OS=="win"', {
4086 'sources': [ 4086 'sources': [
4087 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 4087 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
4088 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 4088 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
4089 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 4089 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
4090 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 4090 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
4091 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 4091 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
4092 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc ', 4092 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
4093 ], 4093 ],
4094 'include_dirs': [ 4094 'include_dirs': [
4095 '<(DEPTH)/third_party/wtl/include', 4095 '<(DEPTH)/third_party/wtl/include',
4096 ], 4096 ],
4097 'dependencies': [ 4097 'dependencies': [
4098 'chrome_version_resources', 4098 'chrome_version_resources',
4099 ], 4099 ],
4100 'conditions': [ 4100 'conditions': [
4101 ['win_use_allocator_shim==1', { 4101 ['win_use_allocator_shim==1', {
4102 'dependencies': [ 4102 'dependencies': [
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
4661 # Use outputs of this action as inputs for the main target build. 4661 # Use outputs of this action as inputs for the main target build.
4662 # Seems as a misnomer but makes this happy on Linux (scons). 4662 # Seems as a misnomer but makes this happy on Linux (scons).
4663 'process_outputs_as_sources': 1, 4663 'process_outputs_as_sources': 1,
4664 }, 4664 },
4665 ], # 'actions' 4665 ], # 'actions'
4666 }, 4666 },
4667 ] 4667 ]
4668 }], # 'coverage!=0' 4668 }], # 'coverage!=0'
4669 ], # 'conditions' 4669 ], # 'conditions'
4670 } 4670 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698