diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 12:23:33 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 12:23:33 +0000 |
| commit | ce6519081756b408818934c8dde8f35990ffb7ec (patch) | |
| tree | a5e7c0f532e4000fd7e87230090ae8681064a6e4 /third_party | |
| parent | 795cde3d24bbe37039e415c45e947be6d95b0a28 (diff) | |
| download | chromium_src-ce6519081756b408818934c8dde8f35990ffb7ec.zip chromium_src-ce6519081756b408818934c8dde8f35990ffb7ec.tar.gz chromium_src-ce6519081756b408818934c8dde8f35990ffb7ec.tar.bz2 | |
Disable ffmpegsumo target due to build-bot issues.
BUG=22307
TEST=none
Review URL: http://codereview.chromium.org/343056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30572 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index 947aa34..64cf546 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -43,7 +43,7 @@ }, },{ # else OS=="linux" 'variables': { - 'target_for_binaries': 'ffmpegsumo_nolink', + 'target_for_binaries': 'ffmpeg_binaries', 'ffmpeg_include_root': 'source/patched-ffmpeg-mt', }, 'targets': [ @@ -560,7 +560,13 @@ 'variables': { # TODO(ajwong): Clean this up after we've finished # migrating to in-tree build. - 'source_files': [], + 'source_files': [ + # TODO(ajwong): Temporary revert to make tree green while + # builder libraries are updated. + 'binaries/<(ffmpeg_bin_dir)/libavcodec.so.52', + 'binaries/<(ffmpeg_bin_dir)/libavformat.so.52', + 'binaries/<(ffmpeg_bin_dir)/libavutil.so.50', + ], }, }], ['OS=="mac"', { # TODO(ajwong): These files are also copied in: |