| Index: remoting/remoting.gyp
|
| diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
|
| index ec3216589f529be1f0dfd7be4991673ca138fcd7..8661eb35708004bbeb20a04d53ead868dd97b926 100644
|
| --- a/remoting/remoting.gyp
|
| +++ b/remoting/remoting.gyp
|
| @@ -138,8 +138,8 @@
|
| 'base/constants.cc',
|
| 'base/constants.h',
|
| 'base/decoder.h',
|
| -# BUG57374,BUG57266 'base/decoder_vp8.cc',
|
| -# BUG57374,BUG57266 'base/decoder_vp8.h',
|
| + 'base/decoder_vp8.cc',
|
| + 'base/decoder_vp8.h',
|
| 'base/decoder_row_based.cc',
|
| 'base/decoder_row_based.h',
|
| 'base/decompressor.h',
|
| @@ -150,8 +150,8 @@
|
| 'base/encoder.h',
|
| 'base/encoder_verbatim.cc',
|
| 'base/encoder_verbatim.h',
|
| -# BUG57374 'base/encoder_vp8.cc',
|
| -# BUG57374 'base/encoder_vp8.h',
|
| + 'base/encoder_vp8.cc',
|
| + 'base/encoder_vp8.h',
|
| 'base/encoder_zlib.cc',
|
| 'base/encoder_zlib.h',
|
| 'base/multiple_array_input_stream.cc',
|
| @@ -162,6 +162,16 @@
|
| 'base/util.cc',
|
| 'base/util.h',
|
| ],
|
| + 'conditions': [
|
| + ['target_arch=="arm"', {
|
| + 'sources!': [
|
| + 'base/decoder_vp8.cc',
|
| + 'base/decoder_vp8.h',
|
| + 'base/encoder_vp8.cc',
|
| + 'base/encoder_vp8.h',
|
| + ],
|
| + }],
|
| + ],
|
| }, # end of target 'chromoting_base'
|
|
|
| {
|
| @@ -420,11 +430,11 @@
|
| # BUG57351 'base/codec_test.cc',
|
| # BUG57351 'base/codec_test.h',
|
| 'base/compressor_zlib_unittest.cc',
|
| -# BUG57374 'base/decoder_vp8_unittest.cc',
|
| +# BUG57351 'base/decoder_vp8_unittest.cc',
|
| 'base/decompressor_zlib_unittest.cc',
|
| # BUG57351 'base/encode_decode_unittest.cc',
|
| # BUG57351 'base/encoder_verbatim_unittest.cc',
|
| -# BUG57374 'base/encoder_vp8_unittest.cc',
|
| +# BUG57351 'base/encoder_vp8_unittest.cc',
|
| # BUG57351 'base/encoder_zlib_unittest.cc',
|
| 'base/mock_objects.h',
|
| 'base/multiple_array_input_stream_unittest.cc',
|
|
|