Support multiple video decoders and encoders

content/content_common.gypi

 # Copyright (c) 2012 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base',
     '../components/tracing.gyp:tracing',
     '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
     '../net/net.gyp:net',
@@ skipping 738 matching lines @@
       'sources': [
         'common/gpu/media/android_video_encode_accelerator.cc',
         'common/gpu/media/android_video_encode_accelerator.h',
       ],
     }],
     ['enable_webrtc==1', {
       'dependencies': [
         '../third_party/libjingle/libjingle.gyp:libjingle',
       ],
     }],
-    ['target_arch=="arm" and chromeos == 1 and use_x11 == 1', {
+    ['chromeos == 1 and use_x11 == 1', {
       'dependencies': [
         '../media/media.gyp:media',
       ],
       'sources': [
         'common/gpu/media/generic_v4l2_video_device.cc',
         'common/gpu/media/generic_v4l2_video_device.h',
         'common/gpu/media/tegra_v4l2_video_device.cc',

[Pawel Osciak, 2014/12/31 07:56:00]

Hm I think we may want to get this out to an arm conditional.

[henryhsu, 2014/12/31 08:47:53]

Done.

         'common/gpu/media/tegra_v4l2_video_device.h',
         'common/gpu/media/v4l2_image_processor.cc',
         'common/gpu/media/v4l2_image_processor.h',
         'common/gpu/media/v4l2_video_decode_accelerator.cc',
         'common/gpu/media/v4l2_video_decode_accelerator.h',
         'common/gpu/media/v4l2_video_device.cc',
         'common/gpu/media/v4l2_video_device.h',
         'common/gpu/media/v4l2_video_encode_accelerator.cc',
         'common/gpu/media/v4l2_video_encode_accelerator.h',
       ],
@@ skipping 154 matching lines @@
         'common/gpu/client/gpu_memory_buffer_impl_ozone.cc',
         'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc',
         'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h',
         'common/gpu/gpu_memory_buffer_factory_ozone.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h',
       ],
     }],
   ],
 }