diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-07 19:35:43 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-07 19:35:43 +0000 |
| commit | 137e58f169fb978c4108f38e7275fefda5e45519 (patch) | |
| tree | d7140551e654937e21fd897bf4b42de933b83fb2 /remoting/remoting.gyp | |
| parent | 11b2483d225127bea7836957a61bb5d1b0f2547a (diff) | |
| download | chromium_src-137e58f169fb978c4108f38e7275fefda5e45519.zip chromium_src-137e58f169fb978c4108f38e7275fefda5e45519.tar.gz chromium_src-137e58f169fb978c4108f38e7275fefda5e45519.tar.bz2 | |
Reenable encoder/decoder tests.
BUG=57351
TEST=Unittests
Review URL: http://codereview.chromium.org/5635003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index e9a7789..d5e4b0f 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -448,15 +448,15 @@ '../testing/gmock/include', ], 'sources': [ -# BUG57351 'base/codec_test.cc', -# BUG57351 'base/codec_test.h', + 'base/codec_test.cc', + 'base/codec_test.h', 'base/compound_buffer_unittest.cc', 'base/compressor_zlib_unittest.cc', -# BUG57351 'base/decoder_vp8_unittest.cc', + 'base/decoder_vp8_unittest.cc', 'base/decompressor_zlib_unittest.cc', -# BUG57351 'base/encode_decode_unittest.cc', -# BUG57351 'base/encoder_vp8_unittest.cc', -# BUG57351 'base/encoder_row_based_unittest.cc', + 'base/encode_decode_unittest.cc', + 'base/encoder_vp8_unittest.cc', + 'base/encoder_row_based_unittest.cc', 'base/mock_objects.h', # BUG57351 'client/chromoting_view_unittest.cc', 'client/mock_objects.h', @@ -519,6 +519,12 @@ 'host/capturer_mac_unittest.cc', ], }], + ['target_arch=="arm"', { + 'sources!': [ + 'base/decoder_vp8_unittest.cc', + 'base/encoder_vp8_unittest.cc', + ], + }], ], # end of 'conditions' }, # end of target 'chromoting_unittests' ], # end of targets |