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

Side by Side Diff: webkit/tools/test_shell/test_shell.gypi

Issue 792005: Move devtool resources from webkit_resources.grd to renderer_resources.grd. (Closed)
Patch Set: split Created 10 years, 9 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
« no previous file with comments | « webkit/glue/webkit_resources.grd ('k') | webkit/tools/test_shell/test_shell_devtools_agent.cc » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'resources/pan_east.cur', 9 'resources/pan_east.cur',
10 'resources/pan_middle.cur', 10 'resources/pan_middle.cur',
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 }, 193 },
194 'conditions': [ 194 'conditions': [
195 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 195 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
196 'actions': [ 196 'actions': [
197 { 197 {
198 'action_name': 'test_shell_repack', 198 'action_name': 'test_shell_repack',
199 'variables': { 199 'variables': {
200 'pak_inputs': [ 200 'pak_inputs': [
201 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 201 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
202 '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pa k', 202 '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pa k',
203 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
203 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', 204 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
204 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', 205 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
205 ], 206 ],
206 }, 207 },
207 'inputs': [ 208 'inputs': [
208 '<(repack_path)', 209 '<(repack_path)',
209 '<@(pak_inputs)', 210 '<@(pak_inputs)',
210 ], 211 ],
211 'outputs': [ 212 'outputs': [
212 '<(pak_path)', 213 '<(pak_path)',
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 '<(SHARED_INTERMEDIATE_DIR)/webkit', 270 '<(SHARED_INTERMEDIATE_DIR)/webkit',
270 ], 271 ],
271 'sources': [ 272 'sources': [
272 '<@(test_shell_windows_resource_files)', 273 '<@(test_shell_windows_resource_files)',
273 # TODO: It would be nice to have these pulled in 274 # TODO: It would be nice to have these pulled in
274 # automatically from direct_dependent_settings in 275 # automatically from direct_dependent_settings in
275 # their various targets (net.gyp:net_resources, etc.), 276 # their various targets (net.gyp:net_resources, etc.),
276 # but that causes errors in other targets when 277 # but that causes errors in other targets when
277 # resulting .res files get referenced multiple times. 278 # resulting .res files get referenced multiple times.
278 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 279 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
280 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.rc',
279 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 281 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
280 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc', 282 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
281 ], 283 ],
282 }], 284 }],
283 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 285 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
284 'conditions': [ 286 'conditions': [
285 ['linux_use_tcmalloc==1', { 287 ['linux_use_tcmalloc==1', {
286 'dependencies': [ 288 'dependencies': [
287 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 289 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
288 ], 290 ],
(...skipping 13 matching lines...) Expand all
302 'variables': { 304 'variables': {
303 'repack_path': '../../../tools/data_pack/repack.py', 305 'repack_path': '../../../tools/data_pack/repack.py',
304 }, 306 },
305 'actions': [ 307 'actions': [
306 { 308 {
307 # TODO(mark): Make this work with more languages than the 309 # TODO(mark): Make this work with more languages than the
308 # hardcoded en-US. 310 # hardcoded en-US.
309 'action_name': 'repack_locale', 311 'action_name': 'repack_locale',
310 'variables': { 312 'variables': {
311 'pak_inputs': [ 313 'pak_inputs': [
314 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
312 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', 315 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
313 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', 316 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
314 ], 317 ],
315 }, 318 },
316 'inputs': [ 319 'inputs': [
317 '<(repack_path)', 320 '<(repack_path)',
318 '<@(pak_inputs)', 321 '<@(pak_inputs)',
319 ], 322 ],
320 'outputs': [ 323 'outputs': [
321 '<(INTERMEDIATE_DIR)/repack/test_shell.pak', 324 '<(INTERMEDIATE_DIR)/repack/test_shell.pak',
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 ], 741 ],
739 }], 742 }],
740 ], 743 ],
741 } 744 }
742 745
743 # Local Variables: 746 # Local Variables:
744 # tab-width:2 747 # tab-width:2
745 # indent-tabs-mode:nil 748 # indent-tabs-mode:nil
746 # End: 749 # End:
747 # vim: set expandtab tabstop=2 shiftwidth=2: 750 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « webkit/glue/webkit_resources.grd ('k') | webkit/tools/test_shell/test_shell_devtools_agent.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698