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

Side by Side Diff: webkit/tools/test_shell/test_shell.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 | « webkit/glue/resources/webkit_resources.grd ('k') | no next file » | 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 { 5 {
6 'variables': { 6 'variables': {
7 'test_shell_windows_resource_files': [ 7 'test_shell_windows_resource_files': [
8 'resources/test_shell.rc', 8 'resources/test_shell.rc',
9 '../../glue/resources/pan_east.cur', 9 '../../glue/resources/pan_east.cur',
10 '../../glue/resources/pan_middle.cur', 10 '../../glue/resources/pan_middle.cur',
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 ], 244 ],
245 'sources': [ 245 'sources': [
246 '<@(test_shell_windows_resource_files)', 246 '<@(test_shell_windows_resource_files)',
247 # TODO: It would be nice to have these pulled in 247 # TODO: It would be nice to have these pulled in
248 # automatically from direct_dependent_settings in 248 # automatically from direct_dependent_settings in
249 # their various targets (net.gyp:net_resources, etc.), 249 # their various targets (net.gyp:net_resources, etc.),
250 # but that causes errors in other targets when 250 # but that causes errors in other targets when
251 # resulting .res files get referenced multiple times. 251 # resulting .res files get referenced multiple times.
252 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 252 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
253 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 253 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
254 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
255 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc', 254 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
256 ], 255 ],
257 'configurations': { 256 'configurations': {
258 'Debug_Base': { 257 'Debug_Base': {
259 'msvs_settings': { 258 'msvs_settings': {
260 'VCLinkerTool': { 259 'VCLinkerTool': {
261 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 260 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
262 }, 261 },
263 }, 262 },
264 }, 263 },
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 'action_name': 'test_shell_resources', 631 'action_name': 'test_shell_resources',
633 'includes': [ '../../../build/grit_action.gypi' ], 632 'includes': [ '../../../build/grit_action.gypi' ],
634 }, 633 },
635 ], 634 ],
636 'includes': [ '../../../build/grit_target.gypi' ], 635 'includes': [ '../../../build/grit_target.gypi' ],
637 }, 636 },
638 ], 637 ],
639 }], 638 }],
640 ], 639 ],
641 } 640 }
OLDNEW
« no previous file with comments | « webkit/glue/resources/webkit_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698