Support multiple video decoders and encoders

content/content_common.gypi

Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index e32344fe64848c9d57a224538c64311c2619a12e..302321d791549363278c4799f31bb93e14c3a49f 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -756,15 +756,13 @@
         '../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',
-        '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',
@@ -778,6 +776,18 @@
         '<(DEPTH)/third_party/khronos',
       ],
     }],
+    ['target_arch == "arm" and chromeos == 1 and use_x11 == 1', {
+      'dependencies': [
+        '../media/media.gyp:media',
+      ],
+      'sources': [
+        'common/gpu/media/tegra_v4l2_video_device.cc',
+        'common/gpu/media/tegra_v4l2_video_device.h',
+      ],
+      'include_dirs': [
+        '<(DEPTH)/third_party/khronos',
+      ],
+    }],
     ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
       'dependencies': [
         '../media/media.gyp:media',