Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: content/content_common.gypi

Issue 826663002: Support multiple video decoders and encoders (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix trybot failure Created 5 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 197bbc687f5b2794935fd20e70bfb5e8d3a482be..52145c65ed805e41bc5709391bae424124cf54da 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -759,15 +759,13 @@
'../third_party/libjingle/libjingle.gyp:libjingle',
],
}],
- ['target_arch=="arm" and chromeos == 1 and use_x11 == 1', {
+ ['chromeos == 1 and (target_arch == "arm" or use_ozone == 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 +778,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': [

Powered by Google App Engine
This is Rietveld 408576698