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

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

Issue 10377155: Move ui/gfx/resources to ui/base/native_theme/resources Step2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: keep gfx_resources.pak for DumpRenderTree Created 8 years, 7 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
« ui/views/views.gyp ('K') | « ui/views/views.gyp ('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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 'repack_path': '../../../tools/grit/grit/format/repack.py', 167 'repack_path': '../../../tools/grit/grit/format/repack.py',
168 'pak_path': '<(INTERMEDIATE_DIR)/repack/test_shell.pak', 168 'pak_path': '<(INTERMEDIATE_DIR)/repack/test_shell.pak',
169 }, 169 },
170 'conditions': [ 170 'conditions': [
171 ['os_posix == 1 and OS != "mac"', { 171 ['os_posix == 1 and OS != "mac"', {
172 'actions': [ 172 'actions': [
173 { 173 {
174 'action_name': 'test_shell_repack', 174 'action_name': 'test_shell_repack',
175 'variables': { 175 'variables': {
176 'pak_inputs': [ 176 'pak_inputs': [
177 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak', 177 '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resou rces.pak',
178 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 178 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
179 '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pa k', 179 '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pa k',
180 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.p ak', 180 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.p ak',
181 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', 181 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
182 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', 182 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
183 ], 183 ],
184 }, 184 },
185 'inputs': [ 185 'inputs': [
186 '<(repack_path)', 186 '<(repack_path)',
187 '<@(pak_inputs)', 187 '<@(pak_inputs)',
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 { 321 {
322 # Copy FFmpeg binaries for audio/video support. 322 # Copy FFmpeg binaries for audio/video support.
323 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/', 323 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/',
324 'files': [ 324 'files': [
325 '<(PRODUCT_DIR)/ffmpegsumo.so', 325 '<(PRODUCT_DIR)/ffmpegsumo.so',
326 ], 326 ],
327 }, 327 },
328 ], 328 ],
329 }, { # OS != "mac" 329 }, { # OS != "mac"
330 'dependencies': [ 330 'dependencies': [
331 '<(DEPTH)/ui/ui.gyp:gfx_resources', 331 '<(DEPTH)/ui/ui.gyp:native_theme_resources',
332 '<(DEPTH)/net/net.gyp:net_resources', 332 '<(DEPTH)/net/net.gyp:net_resources',
333 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', 333 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
334 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', 334 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
335 ] 335 ]
336 }], 336 }],
337 ], 337 ],
338 }, 338 },
339 { 339 {
340 'target_name': 'test_shell_test_support', 340 'target_name': 'test_shell_test_support',
341 'type': 'static_library', 341 'type': 'static_library',
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 'link_settings': { 769 'link_settings': {
770 'libraries': [ 770 'libraries': [
771 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', 771 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
772 ], 772 ],
773 }, 773 },
774 }, 774 },
775 ], 775 ],
776 }], 776 }],
777 ], 777 ],
778 } 778 }
OLDNEW
« ui/views/views.gyp ('K') | « ui/views/views.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698