Index: content/content_common.gypi |
diff --git a/content/content_common.gypi b/content/content_common.gypi |
index 52145c65ed805e41bc5709391bae424124cf54da..197bbc687f5b2794935fd20e70bfb5e8d3a482be 100644 |
--- a/content/content_common.gypi |
+++ b/content/content_common.gypi |
@@ -759,13 +759,15 @@ |
'../third_party/libjingle/libjingle.gyp:libjingle', |
], |
}], |
- ['chromeos == 1 and (target_arch == "arm" or use_ozone == 1)', { |
+ ['target_arch=="arm" and 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', |
@@ -777,14 +779,6 @@ |
], |
'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', { |