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

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

Issue 340072: FFmpeg in-tree build for mac. (Closed)
Patch Set: work around link-settings bug. Created 11 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
« no previous file with comments | « third_party/yasm/yasm.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) 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 'chromium_code': 1, 7 'chromium_code': 1,
8 'test_shell_windows_resource_files': [ 8 'test_shell_windows_resource_files': [
9 'resources/test_shell.rc', 9 'resources/test_shell.rc',
10 'resources/pan_east.cur', 10 'resources/pan_east.cur',
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 'files': [ 328 'files': [
329 '<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/', 329 '<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/',
330 ], 330 ],
331 }, 331 },
332 # TODO(ajwong): This, and the parallel chromium stanza below 332 # TODO(ajwong): This, and the parallel chromium stanza below
333 # really should find a way to share file paths with 333 # really should find a way to share file paths with
334 # ffmpeg.gyp so they don't diverge. (BUG=23602) 334 # ffmpeg.gyp so they don't diverge. (BUG=23602)
335 { 335 {
336 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/', 336 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/',
337 'files': [ 337 'files': [
338 '../../../third_party/ffmpeg/binaries/chromium/mac/ia32/libavcod ec.52.dylib', 338 '<(PRODUCT_DIR)/libffmpegsumo.dylib',
339 '../../../third_party/ffmpeg/binaries/chromium/mac/ia32/libavfor mat.52.dylib',
340 '../../../third_party/ffmpeg/binaries/chromium/mac/ia32/libavuti l.50.dylib',
341 ], 339 ],
342 }, 340 },
343 ], 341 ],
344 }, { # OS != "mac" 342 }, { # OS != "mac"
345 'dependencies': [ 343 'dependencies': [
346 '../../../net/net.gyp:net_resources', 344 '../../../net/net.gyp:net_resources',
347 '../../webkit.gyp:webkit_resources', 345 '../../webkit.gyp:webkit_resources',
348 '../../webkit.gyp:webkit_strings', 346 '../../webkit.gyp:webkit_strings',
349 ] 347 ]
350 }], 348 }],
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 ], 700 ],
703 }], 701 }],
704 ], 702 ],
705 } 703 }
706 704
707 # Local Variables: 705 # Local Variables:
708 # tab-width:2 706 # tab-width:2
709 # indent-tabs-mode:nil 707 # indent-tabs-mode:nil
710 # End: 708 # End:
711 # vim: set expandtab tabstop=2 shiftwidth=2: 709 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « third_party/yasm/yasm.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698