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

Unified Diff: media/BUILD.gn

Issue 1008683002: Allow a dependency on skia when is_ensemble is true. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update the comment for the is_ensemble build variable. Created 5 years, 9 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 | « no previous file | media/media_options.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index a19ec54949804258bbff67319cadc917ac39cab2..494ca6b39c0951afacff87ab72a4e99369ccd1a4 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -83,6 +83,8 @@ if (use_ozone) {
component("media") {
sources = [
+ "blink/skcanvas_video_renderer.cc",
+ "blink/skcanvas_video_renderer.h",
"cdm/aes_decryptor.cc",
"cdm/aes_decryptor.h",
"cdm/cenc_utils.cc",
@@ -123,6 +125,8 @@ component("media") {
"filters/file_data_source.h",
"filters/frame_processor.cc",
"filters/frame_processor.h",
+ "filters/gpu_video_decoder.cc",
+ "filters/gpu_video_decoder.h",
"filters/h264_bit_reader.cc",
"filters/h264_bit_reader.h",
"filters/h264_parser.cc",
@@ -317,13 +321,9 @@ component("media") {
sources += [
"filters/opus_audio_decoder.cc",
"filters/opus_audio_decoder.h",
+ "renderers/default_renderer_factory.cc",
+ "renderers/default_renderer_factory.h",
]
- if (!is_ensemble) {
- sources += [
- "renderers/default_renderer_factory.cc",
- "renderers/default_renderer_factory.h",
- ]
- }
} else {
sources += [
"midi/midi_manager_android.cc",
@@ -480,20 +480,16 @@ component("media") {
"//crypto",
"//crypto:platform", # TODO(ajwong): This used to be provided by crypto.gyp via export_dependent_settings
"//gpu/command_buffer/common",
+ "//skia",
"//third_party/libyuv",
"//third_party/opus",
"//ui/gfx/geometry",
"//url",
]
- # Add the sources and dependencies that need X11, font, or graphics
- # libraries.
+ # Add the sources and dependencies that need the X11 or fontconfig libraries.
if (!is_ensemble) {
sources += [
- "blink/skcanvas_video_renderer.cc",
- "blink/skcanvas_video_renderer.h",
- "filters/gpu_video_decoder.cc",
- "filters/gpu_video_decoder.h",
"video/capture/fake_video_capture_device.cc",
"video/capture/fake_video_capture_device.h",
"video/capture/fake_video_capture_device_factory.cc",
@@ -507,7 +503,6 @@ component("media") {
]
deps += [
- "//skia",
"//ui/events:events_base",
"//ui/gfx",
]
« no previous file with comments | « no previous file | media/media_options.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698