Index: content/content_tests.gypi |
diff --git a/content/content_tests.gypi b/content/content_tests.gypi |
index a72e13ef17c4e8a4a87c1830b4fd4dd1ee9f88a5..6804fc33dcbb221a8515e2dc1c9f7609443304f7 100644 |
--- a/content/content_tests.gypi |
+++ b/content/content_tests.gypi |
@@ -1263,13 +1263,14 @@ |
}, |
], |
}], |
- ['chromeos==1 or OS=="win" or OS=="android"', { |
+ ['(chromeos==1 or (OS=="linux" and use_x11==1 and target_arch != "arm")) or OS=="win" or OS=="android"', { |
'targets': [ |
{ |
'target_name': 'video_decode_accelerator_unittest', |
'type': '<(gtest_target_type)', |
'dependencies': [ |
'content.gyp:content', |
+ 'test_support_content', |
'../base/base.gyp:base', |
'../testing/gtest.gyp:gtest', |
'../media/media.gyp:media', |
@@ -1335,13 +1336,14 @@ |
}, |
] |
}], |
- ['chromeos==1 and use_x11 == 1 and target_arch != "arm"', { |
+ ['(chromeos==1 or OS=="linux") and use_x11==1 and target_arch != "arm"', { |
'targets': [ |
{ |
'target_name': 'vaapi_h264_decoder_unittest', |
'type': '<(gtest_target_type)', |
'dependencies': [ |
'content.gyp:content_common', |
+ 'test_support_content', |
'../base/base.gyp:base', |
'../media/media.gyp:media', |
'../testing/gtest.gyp:gtest', |