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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 10820003: Remove ui_resources_default_100_percent.rc and theme_resources_default_100_percent.rc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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_dll.gypi ('k') | chrome/test/gpu/test_support_gpu.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 (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 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 636
637 # TODO: It would be nice to have these pulled in 637 # TODO: It would be nice to have these pulled in
638 # automatically from direct_dependent_settings in 638 # automatically from direct_dependent_settings in
639 # their various targets (net.gyp:net_resources, etc.), 639 # their various targets (net.gyp:net_resources, etc.),
640 # but that causes errors in other targets when 640 # but that causes errors in other targets when
641 # resulting .res files get referenced multiple times. 641 # resulting .res files get referenced multiple times.
642 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 642 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
643 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 643 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
644 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 644 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
645 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 645 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
646 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
647 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 646 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
648 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 647 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
649 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 648 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
650 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent .rc',
651 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 649 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
652 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 650 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
653 651
654 'browser/accessibility/accessibility_win_browsertest.cc', 652 'browser/accessibility/accessibility_win_browsertest.cc',
655 'browser/ui/views/accessibility/browser_views_accessibility_browsert est.cc', 653 'browser/ui/views/accessibility/browser_views_accessibility_browsert est.cc',
656 ], 654 ],
657 'conditions': [ 655 'conditions': [
658 ['win_use_allocator_shim==1', { 656 ['win_use_allocator_shim==1', {
659 'dependencies': [ 657 'dependencies': [
660 '../base/allocator/allocator.gyp:allocator', 658 '../base/allocator/allocator.gyp:allocator',
(...skipping 1687 matching lines...) Expand 10 before | Expand all | Expand 10 after
2348 'sources': [ 2346 'sources': [
2349 # TODO: It would be nice to have these pulled in 2347 # TODO: It would be nice to have these pulled in
2350 # automatically from direct_dependent_settings in 2348 # automatically from direct_dependent_settings in
2351 # their various targets (net.gyp:net_resources, etc.), 2349 # their various targets (net.gyp:net_resources, etc.),
2352 # but that causes errors in other targets when 2350 # but that causes errors in other targets when
2353 # resulting .res files get referenced multiple times. 2351 # resulting .res files get referenced multiple times.
2354 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 2352 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2355 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 2353 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2356 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 2354 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
2357 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 2355 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
2358 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
2359 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2356 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2360 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 2357 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
2361 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 2358 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
2362 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent .rc',
2363 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 2359 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
2364 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 2360 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
2365 ], 2361 ],
2366 'link_settings': { 2362 'link_settings': {
2367 'libraries': [ 2363 'libraries': [
2368 '-lcomsupp.lib', 2364 '-lcomsupp.lib',
2369 '-loleacc.lib', 2365 '-loleacc.lib',
2370 '-lrpcrt4.lib', 2366 '-lrpcrt4.lib',
2371 '-lurlmon.lib', 2367 '-lurlmon.lib',
2372 '-lwinmm.lib', 2368 '-lwinmm.lib',
(...skipping 849 matching lines...) Expand 10 before | Expand all | Expand 10 after
3222 'sources!': [ 3218 'sources!': [
3223 'browser/rlz/rlz_extension_apitest.cc', 3219 'browser/rlz/rlz_extension_apitest.cc',
3224 ], 3220 ],
3225 }], 3221 }],
3226 ['OS=="win"', { 3222 ['OS=="win"', {
3227 'sources': [ 3223 'sources': [
3228 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3224 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3229 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3225 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3230 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 3226 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
3231 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 3227 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
3232 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
3233 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 3228 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
3234 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 3229 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
3235 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 3230 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
3236 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent .rc',
3237 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 3231 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
3238 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 3232 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
3239 ], 3233 ],
3240 'include_dirs': [ 3234 'include_dirs': [
3241 '<(DEPTH)/third_party/wtl/include', 3235 '<(DEPTH)/third_party/wtl/include',
3242 ], 3236 ],
3243 'dependencies': [ 3237 'dependencies': [
3244 'chrome_version_resources', 3238 'chrome_version_resources',
3245 'security_tests', # run time dependency 3239 'security_tests', # run time dependency
3246 ], 3240 ],
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
3483 ], 3477 ],
3484 }, 3478 },
3485 ], 3479 ],
3486 'conditions': [ 3480 'conditions': [
3487 ['OS=="win"', { 3481 ['OS=="win"', {
3488 'sources': [ 3482 'sources': [
3489 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3483 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3490 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3484 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3491 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 3485 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
3492 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 3486 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
3493 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
3494 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 3487 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
3495 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 3488 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
3496 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 3489 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
3497 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent .rc',
3498 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 3490 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
3499 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 3491 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
3500 ], 3492 ],
3501 'include_dirs': [ 3493 'include_dirs': [
3502 '<(DEPTH)/third_party/wtl/include', 3494 '<(DEPTH)/third_party/wtl/include',
3503 ], 3495 ],
3504 'dependencies': [ 3496 'dependencies': [
3505 'chrome_version_resources', 3497 'chrome_version_resources',
3506 ], 3498 ],
3507 'conditions': [ 3499 'conditions': [
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
3604 }], 3596 }],
3605 ['OS=="win"', { 3597 ['OS=="win"', {
3606 'dependencies': [ 3598 'dependencies': [
3607 'chrome_version_resources', 3599 'chrome_version_resources',
3608 ], 3600 ],
3609 'sources': [ 3601 'sources': [
3610 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3602 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3611 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3603 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3612 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 3604 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
3613 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 3605 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
3614 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
3615 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 3606 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
3616 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 3607 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
3617 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 3608 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
3618 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent .rc',
3619 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 3609 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
3620 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 3610 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
3621 ], 3611 ],
3622 'configurations': { 3612 'configurations': {
3623 'Debug_Base': { 3613 'Debug_Base': {
3624 'msvs_settings': { 3614 'msvs_settings': {
3625 'VCLinkerTool': { 3615 'VCLinkerTool': {
3626 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 3616 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
3627 }, 3617 },
3628 }, 3618 },
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
3971 ['OS=="mac"', { 3961 ['OS=="mac"', {
3972 # 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.
3973 # Search for comments about "xcode_settings" elsewhere in this file. 3963 # Search for comments about "xcode_settings" elsewhere in this file.
3974 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 3964 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
3975 }], 3965 }],
3976 ['OS=="win"', { 3966 ['OS=="win"', {
3977 'sources': [ 3967 'sources': [
3978 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3968 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3979 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3969 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3980 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 3970 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
3981 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
3982 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 3971 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
3983 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent .rc',
3984 ], 3972 ],
3985 'include_dirs': [ 3973 'include_dirs': [
3986 '<(DEPTH)/third_party/wtl/include', 3974 '<(DEPTH)/third_party/wtl/include',
3987 ], 3975 ],
3988 'dependencies': [ 3976 'dependencies': [
3989 'chrome_version_resources', 3977 'chrome_version_resources',
3990 ], 3978 ],
3991 'conditions': [ 3979 'conditions': [
3992 ['win_use_allocator_shim==1', { 3980 ['win_use_allocator_shim==1', {
3993 'dependencies': [ 3981 'dependencies': [
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
4090 ['OS=="mac"', { 4078 ['OS=="mac"', {
4091 # The sync_integration_tests do not run on mac without this flag. 4079 # The sync_integration_tests do not run on mac without this flag.
4092 # Search for comments about "xcode_settings" elsewhere in this file. 4080 # Search for comments about "xcode_settings" elsewhere in this file.
4093 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 4081 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
4094 }], 4082 }],
4095 ['OS=="win"', { 4083 ['OS=="win"', {
4096 'sources': [ 4084 'sources': [
4097 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 4085 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
4098 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 4086 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
4099 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 4087 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
4100 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
4101 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 4088 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
4102 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent .rc',
4103 ], 4089 ],
4104 'include_dirs': [ 4090 'include_dirs': [
4105 '<(DEPTH)/third_party/wtl/include', 4091 '<(DEPTH)/third_party/wtl/include',
4106 ], 4092 ],
4107 'dependencies': [ 4093 'dependencies': [
4108 'chrome_version_resources', 4094 'chrome_version_resources',
4109 ], 4095 ],
4110 'conditions': [ 4096 'conditions': [
4111 ['win_use_allocator_shim==1', { 4097 ['win_use_allocator_shim==1', {
4112 'dependencies': [ 4098 'dependencies': [
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
4693 'input_jars_paths': [ 4679 'input_jars_paths': [
4694 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', 4680 '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
4695 ], 4681 ],
4696 }, 4682 },
4697 'includes': [ '../build/apk_test.gypi' ], 4683 'includes': [ '../build/apk_test.gypi' ],
4698 }, 4684 },
4699 ], 4685 ],
4700 }], 4686 }],
4701 ], # 'conditions' 4687 ], # 'conditions'
4702 } 4688 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/test/gpu/test_support_gpu.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698