Index: content/content_tests.gypi |
diff --git a/content/content_tests.gypi b/content/content_tests.gypi |
index 03c64ce945def23345999d065f92d9e8b019f6b2..6ef5ad129ecee969884f0135fee9c45bbf9b3d2b 100644 |
--- a/content/content_tests.gypi |
+++ b/content/content_tests.gypi |
@@ -1476,7 +1476,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', |
@@ -1550,7 +1550,7 @@ |
}, |
] |
}], |
- ['chromeos==1 and use_x11 == 1 and target_arch != "arm"', { |
+ ['chromeos==1 and target_arch != "arm"', { |
'targets': [ |
{ |
'target_name': 'vaapi_h264_decoder_unittest', |
@@ -1558,7 +1558,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', |
@@ -1570,10 +1569,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', |