diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 11:23:08 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 11:23:08 +0000 |
| commit | 795cde3d24bbe37039e415c45e947be6d95b0a28 (patch) | |
| tree | 2b3a401352c71730fd3e90d7ac4db774077b7283 /build | |
| parent | c567b48d1af4239266f99c7c79611f07723b2704 (diff) | |
| download | chromium_src-795cde3d24bbe37039e415c45e947be6d95b0a28.zip chromium_src-795cde3d24bbe37039e415c45e947be6d95b0a28.tar.gz chromium_src-795cde3d24bbe37039e415c45e947be6d95b0a28.tar.bz2 | |
Add yasm and ffmpeg into the build tree for linux.
BUG=22307
TEST=builds correctly, and an html5 video runs.
Review URL: http://codereview.chromium.org/300013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30571 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index c50a350..bf37324 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -57,11 +57,12 @@ ['OS=="linux"', { 'dependencies': [ '../breakpad/breakpad.gyp:*', + '../courgette/courgette.gyp:*', '../sandbox/sandbox.gyp:*', '../third_party/harfbuzz/harfbuzz.gyp:*', + '../third_party/yasm/yasm.gyp:*', '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*', '../tools/xdisplaycheck/xdisplaycheck.gyp:*', - '../courgette/courgette.gyp:*', ], 'conditions': [ ['branding=="Chrome"', { |