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

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

Issue 6246027: Move src/gfx/ to src/ui/gfx... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 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 | « webkit/support/webkit_support.gypi ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 'repack_path': '../../../tools/data_pack/repack.py', 161 'repack_path': '../../../tools/data_pack/repack.py',
162 'pak_path': '<(INTERMEDIATE_DIR)/repack/test_shell.pak', 162 'pak_path': '<(INTERMEDIATE_DIR)/repack/test_shell.pak',
163 }, 163 },
164 'conditions': [ 164 'conditions': [
165 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 165 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
166 'actions': [ 166 'actions': [
167 { 167 {
168 'action_name': 'test_shell_repack', 168 'action_name': 'test_shell_repack',
169 'variables': { 169 'variables': {
170 'pak_inputs': [ 170 'pak_inputs': [
171 '<(SHARED_INTERMEDIATE_DIR)/gfx/gfx_resources.pak', 171 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak',
172 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 172 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
173 '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pa k', 173 '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pa k',
174 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.p ak', 174 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.p ak',
175 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', 175 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
176 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', 176 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
177 ], 177 ],
178 }, 178 },
179 'inputs': [ 179 'inputs': [
180 '<(repack_path)', 180 '<(repack_path)',
181 '<@(pak_inputs)', 181 '<@(pak_inputs)',
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 # ffmpeg.gyp so they don't diverge. (BUG=23602) 317 # ffmpeg.gyp so they don't diverge. (BUG=23602)
318 { 318 {
319 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/', 319 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/',
320 'files': [ 320 'files': [
321 '<(PRODUCT_DIR)/libffmpegsumo.dylib', 321 '<(PRODUCT_DIR)/libffmpegsumo.dylib',
322 ], 322 ],
323 }, 323 },
324 ], 324 ],
325 }, { # OS != "mac" 325 }, { # OS != "mac"
326 'dependencies': [ 326 'dependencies': [
327 '<(DEPTH)/gfx/gfx.gyp:gfx_resources', 327 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_resources',
328 '<(DEPTH)/net/net.gyp:net_resources', 328 '<(DEPTH)/net/net.gyp:net_resources',
329 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', 329 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
330 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', 330 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
331 ] 331 ]
332 }], 332 }],
333 ], 333 ],
334 }, 334 },
335 { 335 {
336 'target_name': 'test_shell_tests', 336 'target_name': 'test_shell_tests',
337 'type': 'executable', 337 'type': 'executable',
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 ], 729 ],
730 }], 730 }],
731 ], 731 ],
732 } 732 }
733 733
734 # Local Variables: 734 # Local Variables:
735 # tab-width:2 735 # tab-width:2
736 # indent-tabs-mode:nil 736 # indent-tabs-mode:nil
737 # End: 737 # End:
738 # vim: set expandtab tabstop=2 shiftwidth=2: 738 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « webkit/support/webkit_support.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698