diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-20 20:25:58 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-20 20:25:58 +0000 |
| commit | 9925e1d9359bf440339badf05c6cc5b2f98ffd92 (patch) | |
| tree | 422b495dfb09b17ecf10b434a8b1980b7d663925 /third_party | |
| parent | 6eabf03077f6c628076b1f53dc87ea2b7c235e15 (diff) | |
| download | chromium_src-9925e1d9359bf440339badf05c6cc5b2f98ffd92.zip chromium_src-9925e1d9359bf440339badf05c6cc5b2f98ffd92.tar.gz chromium_src-9925e1d9359bf440339badf05c6cc5b2f98ffd92.tar.bz2 | |
Linux: add use_system_ffmpeg GYP variable.
In r20548, we switched from using a shell script to copy the ffmpeg
binaries to the output directory, to using the GYP 'copies' stanza.
When built using Scons, any copies for which the source file was
missing began to fail.
Since Ubuntu policy (and size considerations) prohibit the shipping of
the binaries in the source packages of chromium-browser, so add a GYP
variable which can be set to inhibit this copying for cases where the
source files aren't included.
http://codereview.chromium.org/155791
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index 258a1ae..f035165 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -13,6 +13,9 @@ ['OS!="win"', {'sources/': [['exclude', '/win/']]}], ], }, + 'variables': { + 'use_system_ffmpeg%': 0, + }, 'targets': [ { 'variables': { @@ -194,14 +197,22 @@ }, 'dependencies': ['../../build/win/system.gyp:cygwin'], }], ['OS=="linux"', { - 'variables': { - 'source_files': [ - 'binaries/<(branding_dir)/libavcodec.so.52', - 'binaries/<(branding_dir)/libavformat.so.52', - 'binaries/<(branding_dir)/libavutil.so.50', - ], - }, - }], ['OS=="mac"', { + 'conditions': [ + ['use_system_ffmpeg==0', { + 'variables': { + 'source_files': [ + 'binaries/<(branding_dir)/libavcodec.so.52', + 'binaries/<(branding_dir)/libavformat.so.52', + 'binaries/<(branding_dir)/libavutil.so.50', + ], + }, + }, { + 'variables': { + 'source_files': [] + }, + }], + ]}, + ], ['OS=="mac"', { 'variables': { 'source_files': [ 'binaries/<(branding_dir)/libavcodec.52.dylib', |