Clean up V4L2 codec-related flags and defines

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 744 matching lines @@
         'common/gpu/media/android_video_encode_accelerator.h',
       ],
     }],
     ['enable_webrtc==1', {
       'dependencies': [
         '../third_party/libjingle/libjingle.gyp:libjingle',
       ],
     }],
     ['use_v4lplugin==1 and chromeos==1', {
       'defines': [
-        'USE_LIBV4L2',
+        'USE_LIBV4L2'
       ],
       'variables': {
         'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
         'extra_header': 'common/gpu/media/v4l2_stub_header.fragment',
         'sig_files': ['common/gpu/media/v4l2.sig'],
         'outfile_type': 'posix_stubs',
         'stubs_filename_root': 'v4l2_stubs',
         'project_path': 'content/common/gpu/media',
         'intermediate_dir': '<(INTERMEDIATE_DIR)',
         'output_root': '<(SHARED_INTERMEDIATE_DIR)/v4l2',
@@ skipping 22 matching lines @@
             '-s', '<(stubs_filename_root)',
             '-p', '<(project_path)',
             '<@(_inputs)',
           ],
           'process_outputs_as_sources': 1,
           'message': 'Generating libv4l2 stubs for dynamic loading',
         },
       ],
     }],
     ['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))', {
       '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/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',
+        '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',
       ],
       'conditions': [
         ['target_arch == "arm"', {
           'sources': [
             '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',
-              ],
-            }],
-          ],
         }],
       ],
     }],
     ['target_arch != "arm" and chromeos == 1', {
       'dependencies': [
         '../media/media.gyp:media',
         '../third_party/libyuv/libyuv.gyp:libyuv',
       ],
       'sources': [
         'common/gpu/media/va_surface.h',
@@ skipping 169 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',
       ],
     }],
   ],
 }