Add use_v4l2_codec use flag to include v4l2 codec on x86 CrOS.

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 14 matching lines @@
   ],
   'export_dependent_settings': [
     '../base/base.gyp:base',
     # The public content API headers directly include Blink API headers, so we
     # have to export the blink header settings so that relative paths in these
     # headers resolve correctly.
     '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
   ],
   'variables': {
     'use_v4lplugin%': 0,
+    'use_v4l2_codec%': 0,
     'public_common_sources': [
       'public/common/appcache_info.h',
       'public/common/bindings_policy.h',
       'public/common/child_process_host.h',
       'public/common/child_process_host_delegate.cc',
       'public/common/child_process_host_delegate.h',
       'public/common/child_process_sandbox_support_linux.h',
       'public/common/color_suggestion.cc',
       'public/common/color_suggestion.h',
       'public/common/common_param_traits.cc',
@@ skipping 752 matching lines @@
             '-e', '<(extra_header)',
             '-s', '<(stubs_filename_root)',
             '-p', '<(project_path)',
             '<@(_inputs)',
           ],
           'process_outputs_as_sources': 1,
           'message': 'Generating libv4l2 stubs for dynamic loading',
         },
       ],
     }],
-    ['target_arch=="arm" and chromeos == 1 and use_x11 == 1', {
+    ['chromeos==1 and ((target_arch=="arm" and use_x11==1) or use_v4l2_codec==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',
-        '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',
       ],
       'include_dirs': [
         '<(DEPTH)/third_party/khronos',
       ],
+      'conditions': [
+        ['target_arch == "arm"', {
+          'sources': [
+            'common/gpu/media/tegra_v4l2_video_device.cc',
+            'common/gpu/media/tegra_v4l2_video_device.h',
+          ],
+        }],
+      ],
     }],
     ['target_arch != "arm" and chromeos == 1', {
       'dependencies': [
         '../media/media.gyp:media',
         '../third_party/libyuv/libyuv.gyp:libyuv',
       ],
       'sources': [
         'common/gpu/media/h264_dpb.cc',
         'common/gpu/media/h264_dpb.h',
         'common/gpu/media/va_surface.h',
@@ skipping 167 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',
       ],
     }],
   ],
 }