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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 21952005: Reland: Remove webkit_chromium_resources.pak entries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 # resulting .res files get referenced multiple times. 448 # resulting .res files get referenced multiple times.
449 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 449 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
450 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc', 450 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
451 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 451 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
452 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 452 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
453 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 453 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
454 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 454 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
455 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 455 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
456 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 456 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ',
457 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', 457 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
458 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
459 458
460 'browser/ui/views/accessibility/browser_views_accessibility_browsert est.cc', 459 'browser/ui/views/accessibility/browser_views_accessibility_browsert est.cc',
461 ], 460 ],
462 'conditions': [ 461 'conditions': [
463 ['win_use_allocator_shim==1', { 462 ['win_use_allocator_shim==1', {
464 'dependencies': [ 463 'dependencies': [
465 '../base/allocator/allocator.gyp:allocator', 464 '../base/allocator/allocator.gyp:allocator',
466 ], 465 ],
467 }], 466 }],
468 ['use_aura==1', { 467 ['use_aura==1', {
(...skipping 1449 matching lines...) Expand 10 before | Expand all | Expand 10 after
1918 'sources': [ 1917 'sources': [
1919 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 1918 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
1920 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc', 1919 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
1921 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 1920 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
1922 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 1921 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
1923 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 1922 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
1924 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 1923 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
1925 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 1924 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
1926 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 1925 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ',
1927 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', 1926 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
1928 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
1929 ], 1927 ],
1930 'include_dirs': [ 1928 'include_dirs': [
1931 '<(DEPTH)/third_party/wtl/include', 1929 '<(DEPTH)/third_party/wtl/include',
1932 ], 1930 ],
1933 'dependencies': [ 1931 'dependencies': [
1934 'app_host', 1932 'app_host',
1935 'browser_tests_exe_pdb_workaround', 1933 'browser_tests_exe_pdb_workaround',
1936 'chrome_version_resources', 1934 'chrome_version_resources',
1937 'security_tests', # run time dependency 1935 'security_tests', # run time dependency
1938 ], 1936 ],
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
2157 'sources': [ 2155 'sources': [
2158 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 2156 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2159 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc', 2157 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
2160 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 2158 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2161 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 2159 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
2162 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2160 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2163 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 2161 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
2164 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 2162 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
2165 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 2163 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ',
2166 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', 2164 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
2167 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
2168 ], 2165 ],
2169 'include_dirs': [ 2166 'include_dirs': [
2170 '<(DEPTH)/third_party/wtl/include', 2167 '<(DEPTH)/third_party/wtl/include',
2171 ], 2168 ],
2172 'dependencies': [ 2169 'dependencies': [
2173 'chrome_version_resources', 2170 'chrome_version_resources',
2174 ], 2171 ],
2175 'conditions': [ 2172 'conditions': [
2176 ['win_use_allocator_shim==1', { 2173 ['win_use_allocator_shim==1', {
2177 'dependencies': [ 2174 'dependencies': [
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
2541 'sources': [ 2538 'sources': [
2542 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 2539 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2543 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc', 2540 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
2544 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 2541 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2545 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 2542 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
2546 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2543 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2547 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 2544 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
2548 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 2545 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
2549 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 2546 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ',
2550 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', 2547 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
2551 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
2552 ], 2548 ],
2553 'include_dirs': [ 2549 'include_dirs': [
2554 '<(DEPTH)/third_party/wtl/include', 2550 '<(DEPTH)/third_party/wtl/include',
2555 ], 2551 ],
2556 'dependencies': [ 2552 'dependencies': [
2557 'chrome_version_resources', 2553 'chrome_version_resources',
2558 ], 2554 ],
2559 'conditions': [ 2555 'conditions': [
2560 ['win_use_allocator_shim==1', { 2556 ['win_use_allocator_shim==1', {
2561 'dependencies': [ 2557 'dependencies': [
(...skipping 834 matching lines...) Expand 10 before | Expand all | Expand 10 after
3396 'utility', 3392 'utility',
3397 ], 3393 ],
3398 'sources': [ 3394 'sources': [
3399 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3395 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3400 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3396 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3401 ], 3397 ],
3402 }] 3398 }]
3403 }], 3399 }],
3404 ], # 'conditions' 3400 ], # 'conditions'
3405 } 3401 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698