Clean up V4L2 codec-related flags and defines

content/content_common.gypi

Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 42a2e65e593a7ee77d975c982a2871e5e8b403c2..07b0a02a4bde44dd22a68d05f79c383aa439e4f8 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -762,7 +762,7 @@
     }],
     ['use_v4lplugin==1 and chromeos==1', {
       'defines': [
-        'USE_LIBV4L2',
+        'USE_LIBV4L2'
       ],
       'variables': {
         'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
@@ -805,8 +805,13 @@
       ],
     }],
     ['chromeos==1 and use_v4l2_codec==1', {
+      'direct_dependent_settings': {

[Pawel Osciak, 2015/01/21 09:07:01]

Could you please split the CL into two, one including this chunk only? Otherwise
the test will not pick up V4L2 VDA on x86, which we need for M41.
Thanks.

+        'defines': [
+          'USE_V4L2_CODEC'

[piman, 2015/01/20 19:22:49]

Why is this needed? USE_V4L2_CODEC is not used in headers...

[henryhsu, 2015/01/21 01:36:06]

video_decode_accelerator_unittest uses this definition.
Therefore, content_test.gypi will inherit this definition then we don't have to
declare use_v4l2_codec variable again.

+        ],
+      },
       'defines': [
-        'USE_V4L2_CODEC',
+        'USE_V4L2_CODEC'
       ],
     }],
     ['chromeos==1 and (target_arch=="arm" or (use_ozone==1 and use_v4l2_codec==1))', {
@@ -824,6 +829,17 @@
         'common/gpu/media/v4l2_video_device.h',
         'common/gpu/media/v4l2_video_encode_accelerator.cc',
         'common/gpu/media/v4l2_video_encode_accelerator.h',
+        'common/gpu/media/accelerated_video_decoder.h',

[Pawel Osciak, 2015/01/22 08:30:02]

Order please.

+        'common/gpu/media/h264_decoder.cc',
+        'common/gpu/media/h264_decoder.h',
+        'common/gpu/media/h264_dpb.cc',
+        'common/gpu/media/h264_dpb.h',
+        'common/gpu/media/v4l2_slice_video_decode_accelerator.cc',
+        'common/gpu/media/v4l2_slice_video_decode_accelerator.h',
+        'common/gpu/media/vp8_decoder.cc',
+        'common/gpu/media/vp8_decoder.h',
+        'common/gpu/media/vp8_picture.cc',
+        'common/gpu/media/vp8_picture.h',
       ],
       'include_dirs': [
         '<(DEPTH)/third_party/khronos',
@@ -834,23 +850,6 @@
             'common/gpu/media/tegra_v4l2_video_device.cc',
             'common/gpu/media/tegra_v4l2_video_device.h',
           ],
-          'conditions': [
-            ['use_v4lplugin==1', {
-              'sources': [
-                'common/gpu/media/accelerated_video_decoder.h',
-                'common/gpu/media/h264_decoder.cc',
-                'common/gpu/media/h264_decoder.h',
-                'common/gpu/media/h264_dpb.cc',
-                'common/gpu/media/h264_dpb.h',
-                'common/gpu/media/v4l2_slice_video_decode_accelerator.cc',
-                'common/gpu/media/v4l2_slice_video_decode_accelerator.h',
-                'common/gpu/media/vp8_decoder.cc',
-                'common/gpu/media/vp8_decoder.h',
-                'common/gpu/media/vp8_picture.cc',
-                'common/gpu/media/vp8_picture.h',
-              ],
-            }],
-          ],
         }],
       ],
     }],