| Index: content/content_common.gypi
|
| diff --git a/content/content_common.gypi b/content/content_common.gypi
|
| index 69ec5334c2a6509f09da693356ae524130d7ad8e..06f891536bc1e3f4f4b2aed6a2d43210124fab6c 100644
|
| --- a/content/content_common.gypi
|
| +++ b/content/content_common.gypi
|
| @@ -31,6 +31,7 @@
|
| '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
|
| ],
|
| 'variables': {
|
| + 'use_v4l2_codec%': 0,
|
| 'public_common_sources': [
|
| 'public/common/appcache_info.h',
|
| 'public/common/bindings_policy.h',
|
| @@ -759,15 +760,13 @@
|
| '../third_party/libjingle/libjingle.gyp:libjingle',
|
| ],
|
| }],
|
| - ['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',
|
| @@ -780,6 +779,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': [
|
|
|