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

Unified Diff: media/gpu/BUILD.gn

Issue 2964193002: Revert of h264_decoder_unittests: Initial Change. (Closed)
Patch Set: Created 3 years, 6 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 | « media/BUILD.gn ('k') | media/gpu/h264_decoder_unittest.cc » ('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 fa34594fa7ae9d8c47b613a06a37eb35c391cfd0..1e5b1d0b87922a7ebd87af2dc27e2937890444df 100644
--- a/media/gpu/BUILD.gn
+++ b/media/gpu/BUILD.gn
@@ -128,7 +128,6 @@
defines = [ "MEDIA_GPU_IMPLEMENTATION" ]
sources = [
- "accelerated_video_decoder.h",
"fake_jpeg_decode_accelerator.cc",
"fake_jpeg_decode_accelerator.h",
"fake_video_decode_accelerator.cc",
@@ -140,10 +139,6 @@
"gpu_video_decode_accelerator_helpers.h",
"gpu_video_encode_accelerator_factory.cc",
"gpu_video_encode_accelerator_factory.h",
- "h264_decoder.cc",
- "h264_decoder.h",
- "h264_dpb.cc",
- "h264_dpb.h",
"shared_memory_region.cc",
"shared_memory_region.h",
]
@@ -247,6 +242,15 @@
}
}
+ if (is_chromeos || is_win) {
+ sources += [
+ "accelerated_video_decoder.h",
+ "h264_decoder.cc",
+ "h264_decoder.h",
+ "h264_dpb.cc",
+ "h264_dpb.h",
+ ]
+ }
if (is_chromeos) {
sources += [
"vp8_decoder.cc",
@@ -561,30 +565,6 @@
}
}
-source_set("unit_tests") {
- testonly = true
- deps = [
- "//base",
- "//media/base:test_support",
- "//media/gpu",
- "//testing/gmock",
- "//testing/gtest",
- ]
- sources = [
- "h264_decoder_unittest.cc",
- ]
-
- if (is_android) {
- deps += [
- # The test needs the java dependencies to add the java classes for their
- # native counterparts to the test apk.
- ":android_video_decode_accelerator_unittests",
- "//media/base/android:media_java",
- "//ui/android:ui_java",
- ]
- }
-}
-
test("video_decode_accelerator_service_unittest") {
sources = [
"ipc/service/gpu_jpeg_decode_accelerator_unittest.cc",
« no previous file with comments | « media/BUILD.gn ('k') | media/gpu/h264_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698