diff options
| author | henryhsu <henryhsu@chromium.org> | 2015-01-08 21:53:07 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-09 05:54:08 +0000 |
| commit | 4c80f1560683212ff5116b53f2830ba53b614442 (patch) | |
| tree | 88155dd711981f1804f40845a4713245d9bba981 /content/content_common.gypi | |
| parent | d209afa5561213383fa0bc18423a28c684dbe142 (diff) | |
| download | chromium_src-4c80f1560683212ff5116b53f2830ba53b614442.zip chromium_src-4c80f1560683212ff5116b53f2830ba53b614442.tar.gz chromium_src-4c80f1560683212ff5116b53f2830ba53b614442.tar.bz2 | |
Add use_v4l2_codec use flag to include v4l2 codec on x86 CrOS.
Because some trybots such as linux chromeos ozone use old linux
header files, use this flag to workaround chromium:446088 issue
to skip those trybots. So we can re-submit
https://codereview.chromium.org/826663002/. After 446088 is
fixed, this CL should be reverted.
BUG=445016
TEST=build squawks with this flag
Review URL: https://codereview.chromium.org/799543005
Cr-Commit-Position: refs/heads/master@{#310715}
Diffstat (limited to 'content/content_common.gypi')
| -rw-r--r-- | content/content_common.gypi | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi index e3d3b08..87f3015 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -32,6 +32,7 @@ ], 'variables': { 'use_v4lplugin%': 0, + 'use_v4l2_codec%': 0, 'public_common_sources': [ 'public/common/appcache_info.h', 'public/common/bindings_policy.h', @@ -804,15 +805,13 @@ }, ], }], - ['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', @@ -825,6 +824,14 @@ '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': [ |