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

Unified Diff: media/gpu/BUILD.gn

Issue 1969503002: Address more TOOD(GYP) in GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 7 months 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
« no previous file with comments | « extensions/shell/BUILD.gn ('k') | media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/BUILD.gn
diff --git a/media/gpu/BUILD.gn b/media/gpu/BUILD.gn
index 09f394371349fd0050ff9f5c0c9cfbfe7091d838..5ca89e27844842164c242de3dd2d768b2d215e0d 100644
--- a/media/gpu/BUILD.gn
+++ b/media/gpu/BUILD.gn
@@ -343,8 +343,6 @@ component("gpu") {
"/DELAYLOAD:mf.dll",
"/DELAYLOAD:mfplat.dll",
]
-
- # TODO(GYP): extract_xinput action.
}
if (use_x11) {
@@ -352,9 +350,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",
@@ -368,15 +369,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",
@@ -385,17 +394,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
« no previous file with comments | « extensions/shell/BUILD.gn ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698