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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 11418003: Remove rc file for scaled resource pak (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: keep webkit_resources for DumpRenderTree Created 8 years, 1 month 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/chrome_tests_unit.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 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 312
313 # TODO: It would be nice to have these pulled in 313 # TODO: It would be nice to have these pulled in
314 # automatically from direct_dependent_settings in 314 # automatically from direct_dependent_settings in
315 # their various targets (net.gyp:net_resources, etc.), 315 # their various targets (net.gyp:net_resources, etc.),
316 # but that causes errors in other targets when 316 # but that causes errors in other targets when
317 # resulting .res files get referenced multiple times. 317 # resulting .res files get referenced multiple times.
318 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 318 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
319 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc', 319 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
320 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 320 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
321 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 321 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
322 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
323 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 322 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
324 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 323 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
325 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 324 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
326 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 325 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
327 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
328 326
329 'browser/accessibility/accessibility_win_browsertest.cc', 327 'browser/accessibility/accessibility_win_browsertest.cc',
330 'browser/ui/views/accessibility/browser_views_accessibility_browsert est.cc', 328 'browser/ui/views/accessibility/browser_views_accessibility_browsert est.cc',
331 ], 329 ],
332 'conditions': [ 330 'conditions': [
333 ['win_use_allocator_shim==1', { 331 ['win_use_allocator_shim==1', {
334 'dependencies': [ 332 'dependencies': [
335 '../base/allocator/allocator.gyp:allocator', 333 '../base/allocator/allocator.gyp:allocator',
336 ], 334 ],
337 }], 335 }],
(...skipping 994 matching lines...) Expand 10 before | Expand all | Expand 10 after
1332 'sources!': [ 1330 'sources!': [
1333 'browser/rlz/rlz_extension_apitest.cc', 1331 'browser/rlz/rlz_extension_apitest.cc',
1334 ], 1332 ],
1335 }], 1333 }],
1336 ['OS=="win"', { 1334 ['OS=="win"', {
1337 'sources': [ 1335 'sources': [
1338 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 1336 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
1339 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc', 1337 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
1340 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 1338 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
1341 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 1339 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
1342 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
1343 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 1340 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
1344 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 1341 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
1345 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 1342 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
1346 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 1343 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
1347 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
1348 ], 1344 ],
1349 'include_dirs': [ 1345 'include_dirs': [
1350 '<(DEPTH)/third_party/wtl/include', 1346 '<(DEPTH)/third_party/wtl/include',
1351 ], 1347 ],
1352 'dependencies': [ 1348 'dependencies': [
1353 'chrome_version_resources', 1349 'chrome_version_resources',
1354 'security_tests', # run time dependency 1350 'security_tests', # run time dependency
1355 ], 1351 ],
1356 'conditions': [ 1352 'conditions': [
1357 ['win_use_allocator_shim==1', { 1353 ['win_use_allocator_shim==1', {
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
1544 ], 1540 ],
1545 }, 1541 },
1546 ], 1542 ],
1547 'conditions': [ 1543 'conditions': [
1548 ['OS=="win"', { 1544 ['OS=="win"', {
1549 'sources': [ 1545 'sources': [
1550 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 1546 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
1551 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc', 1547 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
1552 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 1548 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
1553 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 1549 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
1554 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
1555 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 1550 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
1556 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 1551 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
1557 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 1552 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
1558 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 1553 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
1559 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
1560 ], 1554 ],
1561 'include_dirs': [ 1555 'include_dirs': [
1562 '<(DEPTH)/third_party/wtl/include', 1556 '<(DEPTH)/third_party/wtl/include',
1563 ], 1557 ],
1564 'dependencies': [ 1558 'dependencies': [
1565 'chrome_version_resources', 1559 'chrome_version_resources',
1566 ], 1560 ],
1567 'conditions': [ 1561 'conditions': [
1568 ['win_use_allocator_shim==1', { 1562 ['win_use_allocator_shim==1', {
1569 'dependencies': [ 1563 'dependencies': [
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
1665 }], 1659 }],
1666 ['OS=="win"', { 1660 ['OS=="win"', {
1667 'dependencies': [ 1661 'dependencies': [
1668 'chrome_version_resources', 1662 'chrome_version_resources',
1669 ], 1663 ],
1670 'sources': [ 1664 'sources': [
1671 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 1665 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
1672 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc', 1666 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
1673 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 1667 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
1674 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 1668 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
1675 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
1676 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 1669 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
1677 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 1670 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
1678 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 1671 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
1679 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 1672 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
1680 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
1681 ], 1673 ],
1682 'configurations': { 1674 'configurations': {
1683 'Debug_Base': { 1675 'Debug_Base': {
1684 'msvs_settings': { 1676 'msvs_settings': {
1685 'VCLinkerTool': { 1677 'VCLinkerTool': {
1686 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 1678 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
1687 }, 1679 },
1688 }, 1680 },
1689 }, 1681 },
1690 }, 1682 },
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
2035 # The sync_integration_tests do not run on mac without this flag. 2027 # The sync_integration_tests do not run on mac without this flag.
2036 # Search for comments about "xcode_settings" elsewhere in this file. 2028 # Search for comments about "xcode_settings" elsewhere in this file.
2037 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 2029 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
2038 }], 2030 }],
2039 ['OS=="win"', { 2031 ['OS=="win"', {
2040 'sources': [ 2032 'sources': [
2041 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 2033 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2042 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc', 2034 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
2043 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 2035 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2044 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 2036 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
2045 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
2046 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2037 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2047 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 2038 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
2048 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 2039 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
2049 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 2040 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
2050 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
2051 ], 2041 ],
2052 'include_dirs': [ 2042 'include_dirs': [
2053 '<(DEPTH)/third_party/wtl/include', 2043 '<(DEPTH)/third_party/wtl/include',
2054 ], 2044 ],
2055 'dependencies': [ 2045 'dependencies': [
2056 'chrome_version_resources', 2046 'chrome_version_resources',
2057 ], 2047 ],
2058 'conditions': [ 2048 'conditions': [
2059 ['win_use_allocator_shim==1', { 2049 ['win_use_allocator_shim==1', {
2060 'dependencies': [ 2050 'dependencies': [
(...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after
2837 'sync_integration_tests.isolate', 2827 'sync_integration_tests.isolate',
2838 ], 2828 ],
2839 'sources': [ 2829 'sources': [
2840 'sync_integration_tests.isolate', 2830 'sync_integration_tests.isolate',
2841 ], 2831 ],
2842 }, 2832 },
2843 ], 2833 ],
2844 }], 2834 }],
2845 ], # 'conditions' 2835 ], # 'conditions'
2846 } 2836 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698