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

Side by Side Diff: build/all.gyp

Issue 300013: Add yasm and ffmpeg into the build tree for linux. (Closed)
Patch Set: Fix mark's comments. 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 | « DEPS ('k') | chrome/installer/installer.gyp » ('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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'All', 8 'target_name': 'All',
9 'type': 'none', 9 'type': 'none',
10 'xcode_create_dependents_test_runner': 1, 10 'xcode_create_dependents_test_runner': 1,
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 ], 50 ],
51 }], 51 }],
52 ['OS=="mac"', { 52 ['OS=="mac"', {
53 'dependencies': [ 53 'dependencies': [
54 '../third_party/ocmock/ocmock.gyp:*', 54 '../third_party/ocmock/ocmock.gyp:*',
55 ], 55 ],
56 }], 56 }],
57 ['OS=="linux"', { 57 ['OS=="linux"', {
58 'dependencies': [ 58 'dependencies': [
59 '../breakpad/breakpad.gyp:*', 59 '../breakpad/breakpad.gyp:*',
60 '../courgette/courgette.gyp:*',
60 '../sandbox/sandbox.gyp:*', 61 '../sandbox/sandbox.gyp:*',
61 '../third_party/harfbuzz/harfbuzz.gyp:*', 62 '../third_party/harfbuzz/harfbuzz.gyp:*',
63 '../third_party/yasm/yasm.gyp:*',
62 '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*', 64 '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*',
63 '../tools/xdisplaycheck/xdisplaycheck.gyp:*', 65 '../tools/xdisplaycheck/xdisplaycheck.gyp:*',
64 '../courgette/courgette.gyp:*',
65 ], 66 ],
66 'conditions': [ 67 'conditions': [
67 ['branding=="Chrome"', { 68 ['branding=="Chrome"', {
68 'dependencies': [ 69 'dependencies': [
69 '../chrome/installer/installer.gyp:linux_packages', 70 '../chrome/installer/installer.gyp:linux_packages',
70 ], 71 ],
71 }], 72 }],
72 ], 73 ],
73 }], 74 }],
74 ['OS=="win"', { 75 ['OS=="win"', {
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 ], # targets 231 ], # targets
231 }], # OS="win" 232 }], # OS="win"
232 ], # conditions 233 ], # conditions
233 } 234 }
234 235
235 # Local Variables: 236 # Local Variables:
236 # tab-width:2 237 # tab-width:2
237 # indent-tabs-mode:nil 238 # indent-tabs-mode:nil
238 # End: 239 # End:
239 # vim: set expandtab tabstop=2 shiftwidth=2: 240 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « DEPS ('k') | chrome/installer/installer.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698