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

Unified Diff: content/content_tests.gypi

Issue 490233002: VaapiVideoAccelerator: make Vaapi accelerator work with ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase on ToT Created 6 years 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_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index c86eafde3409d6b09e32597b2af99382aab55479..29e15604b8807c7e0206cd67399084f80ff0d603 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1521,7 +1521,7 @@
},
],
}],
- ['(chromeos==1 or OS=="win" or OS=="android") and use_ozone==0', {
+ ['chromeos==1 or OS=="win" or OS=="android"', {
'targets': [
{
'target_name': 'video_decode_accelerator_unittest',
@@ -1589,13 +1589,18 @@
'../ui/gfx/x/gfx_x11.gyp:gfx_x11',
],
}],
+ ['use_ozone==1 and chromeos==1', {
+ 'dependencies': [
+ '../ui/display/display.gyp:display', # Used by rendering_helper.cc
+ ],
+ }],
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
},
]
}],
- ['chromeos==1 and use_x11 == 1 and target_arch != "arm"', {
+ ['chromeos==1 and target_arch != "arm"', {
'targets': [
{
'target_name': 'vaapi_h264_decoder_unittest',
@@ -1603,7 +1608,6 @@
'dependencies': [
'content.gyp:content_common',
'../base/base.gyp:base',
- '../build/linux/system.gyp:x11',
'../media/media.gyp:media',
'../testing/gtest.gyp:gtest',
'../third_party/libyuv/libyuv.gyp:libyuv',
@@ -1615,10 +1619,21 @@
'include_dirs': [
'<(DEPTH)/third_party/libva',
],
+ 'conditions': [
+ ['use_x11==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:x11',
+ ]
+ }, {
+ 'dependencies': [
+ '../build/linux/system.gyp:libdrm',
+ ]
+ }],
+ ],
},
]
}],
- ['chromeos==1 and (target_arch == "arm" or use_x11 == 1)', {
+ ['chromeos==1', {
'targets': [
{
'target_name': 'video_encode_accelerator_unittest',

Powered by Google App Engine
This is Rietveld 408576698