diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 12:39:15 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 12:39:15 +0000 |
| commit | c040079a2b8ea8c898fe433c3e61ff3ae927698f (patch) | |
| tree | 9d080cfe3ae7f3ade55e532f855e41c15df9fd65 /third_party | |
| parent | ce6519081756b408818934c8dde8f35990ffb7ec (diff) | |
| download | chromium_src-c040079a2b8ea8c898fe433c3e61ff3ae927698f.zip chromium_src-c040079a2b8ea8c898fe433c3e61ff3ae927698f.tar.gz chromium_src-c040079a2b8ea8c898fe433c3e61ff3ae927698f.tar.bz2 | |
Disable the whole ffmpegsumo clause via a tautology.
TBR=mark
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index 64cf546..1b7d421 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -36,14 +36,14 @@ # # TODO(ajwong): Per the comment above, reduce this conditional's size and # determine if in-tree build in Windows is tractable. - ['OS!="linux" and OS!="freebsd"', { + ['OS!="linux" or OS=="freebsd" or OS=="linux"', { 'variables': { 'target_for_binaries': 'ffmpeg_binaries', 'ffmpeg_include_root': 'include', }, },{ # else OS=="linux" 'variables': { - 'target_for_binaries': 'ffmpeg_binaries', + 'target_for_binaries': 'ffmpegsumo_nolink', 'ffmpeg_include_root': 'source/patched-ffmpeg-mt', }, 'targets': [ |