diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 00:18:06 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 00:18:06 +0000 |
| commit | ccd07800092c2f6337decffb62c9eb30c1d946b2 (patch) | |
| tree | c3bcd3baf8d64a7e1051ab004a514c811a121519 /remoting | |
| parent | b5fcc0e80cbfbe21c952bf6abca772b813f9862b (diff) | |
| download | chromium_src-ccd07800092c2f6337decffb62c9eb30c1d946b2.zip chromium_src-ccd07800092c2f6337decffb62c9eb30c1d946b2.tar.gz chromium_src-ccd07800092c2f6337decffb62c9eb30c1d946b2.tar.bz2 | |
Resubmit - Roll DEPS to include changes to FFmpeg build system
TBR=fbarchrd
BUG=57266
TEST=Tree is green. ARM ffmpeg can be loaded.
Review URL: http://codereview.chromium.org/3555004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/remoting.gyp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 47d498c..e64624b 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -402,11 +402,13 @@ 'base/codec_test.h', 'base/compressor_zlib_unittest.cc', 'base/decoder_verbatim_unittest.cc', - 'base/decoder_vp8_unittest.cc', 'base/decoder_zlib_unittest.cc', 'base/decompressor_zlib_unittest.cc', 'base/encoder_verbatim_unittest.cc', - 'base/encoder_vp8_unittest.cc', + # These two tests are disabled due to threading problems in libvpx. + # See bug: http://crbug.com/57266 + # 'base/decoder_vp8_unittest.cc', + # 'base/encoder_vp8_unittest.cc', 'base/encoder_zlib_unittest.cc', 'base/mock_objects.h', 'base/multiple_array_input_stream_unittest.cc', |