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

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

Issue 8588063: Remove TODOs for copying FFmpeg binaries for Mac. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: Created 9 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 | « chrome/chrome_dll.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 '../../glue/resources/pan_east.cur', 9 '../../glue/resources/pan_east.cur',
10 '../../glue/resources/pan_middle.cur', 10 '../../glue/resources/pan_middle.cur',
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 '<@(pak_inputs)', 302 '<@(pak_inputs)',
303 ], 303 ],
304 'outputs': [ 304 'outputs': [
305 '<(INTERMEDIATE_DIR)/repack/test_shell.pak', 305 '<(INTERMEDIATE_DIR)/repack/test_shell.pak',
306 ], 306 ],
307 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inp uts)'], 307 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inp uts)'],
308 'process_outputs_as_mac_bundle_resources': 1, 308 'process_outputs_as_mac_bundle_resources': 1,
309 }, 309 },
310 ], 310 ],
311 'copies': [ 311 'copies': [
312 # TODO(ajwong): This, and the parallel chromium stanza below
313 # really should find a way to share file paths with
314 # ffmpeg.gyp so they don't diverge. (BUG=23602)
315 { 312 {
313 # Copy FFmpeg binaries for audio/video support.
316 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/', 314 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/',
317 'files': [ 315 'files': [
318 '<(PRODUCT_DIR)/ffmpegsumo.so', 316 '<(PRODUCT_DIR)/ffmpegsumo.so',
319 ], 317 ],
320 }, 318 },
321 ], 319 ],
322 }, { # OS != "mac" 320 }, { # OS != "mac"
323 'dependencies': [ 321 'dependencies': [
324 '<(DEPTH)/ui/ui.gyp:gfx_resources', 322 '<(DEPTH)/ui/ui.gyp:gfx_resources',
325 '<(DEPTH)/net/net.gyp:net_resources', 323 '<(DEPTH)/net/net.gyp:net_resources',
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 'link_settings': { 749 'link_settings': {
752 'libraries': [ 750 'libraries': [
753 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', 751 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
754 ], 752 ],
755 }, 753 },
756 }, 754 },
757 ], 755 ],
758 }], 756 }],
759 ], 757 ],
760 } 758 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698