Revert 64672 - Cleanups in the video encoding decoding code. Reenable VP8....

remoting/remoting.gyp

 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
 
   'target_defaults': {
@@ skipping 120 matching lines @@
       'hard_dependency': 1,
       'sources': [
         'base/capture_data.cc',
         'base/capture_data.h',
         'base/compressor.h',
         'base/compressor_zlib.cc',
         'base/compressor_zlib.h',
         'base/constants.cc',
         'base/constants.h',
         'base/decoder.h',
-        'base/decoder_vp8.cc',
-        'base/decoder_vp8.h',
+# BUG57374,BUG57266       'base/decoder_vp8.cc',
+# BUG57374,BUG57266       'base/decoder_vp8.h',
         'base/decoder_row_based.cc',
         'base/decoder_row_based.h',
         'base/decompressor.h',
         'base/decompressor_verbatim.cc',
         'base/decompressor_verbatim.h',
         'base/decompressor_zlib.cc',
         'base/decompressor_zlib.h',
         'base/encoder.h',
         'base/encoder_verbatim.cc',
         'base/encoder_verbatim.h',
-        'base/encoder_vp8.cc',
-        'base/encoder_vp8.h',
+# BUG57374       'base/encoder_vp8.cc',
+# BUG57374       'base/encoder_vp8.h',
         'base/encoder_zlib.cc',
         'base/encoder_zlib.h',
         'base/multiple_array_input_stream.cc',
         'base/multiple_array_input_stream.h',
         'base/tracer.cc',
         'base/tracer.h',
         'base/types.h',
         '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'
 
     {
       'target_name': 'chromoting_host',
       'type': '<(library)',
       'dependencies': [
         'chromoting_base',
         'chromoting_jingle_glue',
         'chromoting_protocol',
       ],
@@ skipping 238 matching lines @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '../testing/gmock/include',
       ],
       'sources': [
 # BUG57351        'base/codec_test.cc',
 # BUG57351        'base/codec_test.h',
         'base/compressor_zlib_unittest.cc',
-# BUG57351        'base/decoder_vp8_unittest.cc',
+# BUG57374        'base/decoder_vp8_unittest.cc',
         'base/decompressor_zlib_unittest.cc',
 # BUG57351        'base/encode_decode_unittest.cc',
 # BUG57351        'base/encoder_verbatim_unittest.cc',
-# BUG57351        'base/encoder_vp8_unittest.cc',
+# BUG57374        'base/encoder_vp8_unittest.cc',
 # BUG57351        'base/encoder_zlib_unittest.cc',
         'base/mock_objects.h',
         'base/multiple_array_input_stream_unittest.cc',
 # BUG57351        'client/chromoting_view_unittest.cc',
         'client/mock_objects.h',
         'host/access_verifier_unittest.cc',
         'host/chromoting_host_context_unittest.cc',
         'host/client_connection_unittest.cc',
         'host/differ_unittest.cc',
         'host/differ_block_unittest.cc',
@@ skipping 51 matching lines @@
       ],  # end of 'conditions'
     },  # end of target 'chromoting_unittests'
   ],  # end of targets
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: