Chromium Code Reviews| Index: content/test/BUILD.gn |
| diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn |
| index 03ca8a943100da4e5e3daf431aab97b50371a4fa..1fe211c37057006ccef946eac4de8920bb2ade29 100644 |
| --- a/content/test/BUILD.gn |
| +++ b/content/test/BUILD.gn |
| @@ -908,8 +908,8 @@ test("content_perftests") { |
| } |
| } |
| -if (is_android) { |
| - # TODO(GYP): Port Windows and ChromeOS logic. |
| +if (is_android || is_chromeos) { |
| + # TODO(GYP): Port Windows logic. |
| test("video_decode_accelerator_unittest") { |
| deps = [ |
| "//base", |
| @@ -924,6 +924,9 @@ if (is_android) { |
| "//ui/gl:test_support", |
| ] |
| configs += [ "//third_party/khronos:khronos_headers" ] |
| + if (is_chromeos && target_cpu != "arm") { |
| + configs += [ "//third_party/libva:libva_config" ] |
| + } |
|
piman
2016/04/28 23:36:48
nit: Why is this needed? the sources don't include
stevenjb
2016/04/29 17:17:56
Otherwise we get this:
In file included from ../.
Dirk Pranke
2016/04/29 21:58:50
//content/common should be exporting this as a pub
|
| sources = [ |
| "//content/common/gpu/media/video_accelerator_unittest_helpers.h", |
| ] |
| @@ -947,5 +950,47 @@ if (is_android) { |
| "//ui/android:ui_java", |
| ] |
| } |
| + if (is_chromeos && use_ozone) { |
| + deps += [ |
| + "//ui/display", # Used by rendering_helper.cc |
| + "//ui/ozone", # Used by rendering_helper.cc |
| + ] |
| + } |
| + if (use_x11) { |
| + configs += [ "//build/config/linux:x11" ] |
| + deps += [ "//ui/gfx/x" ] |
| + } |
| + } |
| +} |
| + |
| +if (is_chromeos || is_mac) { |
| + test("video_encode_accelerator_unittest") { |
| + deps = [ |
| + "//base", |
| + "//content", |
| + "//media", |
| + "//media/base:test_support", |
| + "//testing/gtest", |
| + "//ui/base", |
| + "//ui/gfx", |
| + "//ui/gfx:test_support", |
| + "//ui/gfx/geometry", |
| + "//ui/gl", |
| + "//ui/gl:test_support", |
| + ] |
| + configs += [ |
| + "//third_party/libva:libva_config", |
| + "//third_party/libyuv:libyuv_config", |
|
piman
2016/04/28 23:36:48
ditto (both)
stevenjb
2016/04/29 17:17:57
ditto
Dirk Pranke
2016/04/29 21:58:50
ditto.
|
| + ] |
| + sources = [ |
| + "//content/common/gpu/media/video_accelerator_unittest_helpers.h", |
| + "//content/common/gpu/media/video_encode_accelerator_unittest.cc", |
| + ] |
| + if (use_x11) { |
| + deps += [ "//ui/gfx/x" ] |
| + } |
| + if (use_ozone) { |
| + deps += [ "//ui/ozone" ] |
| + } |
| } |
| } |