diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 21:51:29 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 21:51:29 +0000 |
| commit | f6da194c837f7b0e208ca4c158a839a21dd3e329 (patch) | |
| tree | c6dfe209938224b269f24d1c94d79ea0f7c48e2f /third_party | |
| parent | 9c0b0aee86c9fd8b93a8e85141d60fbcc04b42d2 (diff) | |
| download | chromium_src-f6da194c837f7b0e208ca4c158a839a21dd3e329.zip chromium_src-f6da194c837f7b0e208ca4c158a839a21dd3e329.tar.gz chromium_src-f6da194c837f7b0e208ca4c158a839a21dd3e329.tar.bz2 | |
Fix conditional for ffmpegsumo build.
ajwong basic math: FAIL.
BUG=22307
TEST=Clobber built test shell in release and found sumo built.
Review URL: http://codereview.chromium.org/342066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index 955cac4..6482f2c 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -38,7 +38,7 @@ # # TODO(ajwong): Per the comment above, reduce this conditional's size and # determine if in-tree build in Windows is tractable. - ['OS!="linux" or OS!="freebsd" or use_system_ffmpeg==0', { + ['(OS!="linux" and OS!="freebsd") or use_system_ffmpeg!=0', { 'variables': { 'target_for_binaries': 'ffmpeg_binaries', 'ffmpeg_include_root': 'include', |