Index: media/gpu/BUILD.gn |
diff --git a/media/gpu/BUILD.gn b/media/gpu/BUILD.gn |
index 0b9a9be4a227a83737f16d185ca05721aae4779d..96a7543c4fe09ba81c4477b9ae5609e59c0a2b15 100644 |
--- a/media/gpu/BUILD.gn |
+++ b/media/gpu/BUILD.gn |
@@ -347,8 +347,6 @@ component("gpu") { |
"/DELAYLOAD:mf.dll", |
"/DELAYLOAD:mfplat.dll", |
] |
- |
- # TODO(GYP): extract_xinput action. |
} |
if (use_x11) { |
@@ -356,9 +354,12 @@ component("gpu") { |
} |
} |
-if (is_android || is_chromeos) { |
- # TODO(GYP): Port Windows logic. |
+if (is_win || is_android || is_chromeos) { |
test("video_decode_accelerator_unittest") { |
+ sources = [ |
+ "video_accelerator_unittest_helpers.h", |
+ ] |
+ |
deps = [ |
":gpu", |
"//base", |
@@ -372,15 +373,23 @@ if (is_android || is_chromeos) { |
"//ui/gl", |
"//ui/gl:test_support", |
] |
+ |
configs += [ "//third_party/khronos:khronos_headers" ] |
if (is_chromeos && target_cpu != "arm") { |
configs += [ "//third_party/libva:libva_config" ] |
} |
- sources = [ |
- "video_accelerator_unittest_helpers.h", |
- ] |
+ |
if (is_android) { |
sources += [ "android_video_decode_accelerator_unittest.cc" ] |
+ deps += [ |
+ "//gpu:test_support", |
+ "//media/base/android", |
+ "//media/base/android:media_java", |
+ "//media/capture/video/android:capture_java", |
+ "//mojo/public/c/system:for_shared_library", |
+ "//testing/gmock", |
+ "//ui/android:ui_java", |
+ ] |
} else { |
sources += [ |
"rendering_helper.cc", |
@@ -389,17 +398,15 @@ if (is_android || is_chromeos) { |
] |
} |
- if (is_android) { |
+ if (is_win) { |
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
deps += [ |
- "//gpu:test_support", |
- "//media/base/android", |
- "//media/base/android:media_java", |
- "//media/capture/video/android:capture_java", |
- "//mojo/public/c/system:for_shared_library", |
- "//testing/gmock", |
- "//ui/android:ui_java", |
+ "//third_party/angle:libEGL", |
+ "//third_party/angle:libGLESv2", |
] |
} |
+ |
if (is_chromeos && use_ozone) { |
deps += [ |
"//ui/display", # Used by rendering_helper.cc |