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

Unified Diff: media/BUILD.gn

Issue 1964963002: media: Fix gn deps on media/ targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add bug reference + rebase 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 | « no previous file | media/base/BUILD.gn » ('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 b3c55e74a83d6ecdf4c58794e4987e038be52441..83c3ea196cf1dc4738aaf07f7ecf5308d2ac374e 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -77,6 +77,22 @@ source_set("cdm_api") {
]
}
+# TODO(jrummell): This should be in media/filters/BUILD.gn (which doesn't
+# currently exist). http://crbug.com/613033
+source_set("filters_common") {
+ sources = [
+ "filters/file_data_source.h",
+ ]
+ if (media_use_ffmpeg) {
+ sources += [
+ "filters/blocking_url_protocol.h",
+ "filters/ffmpeg_glue.h",
+ ]
+ }
+}
+
+# TODO(jrummell): Each subdirectory should have it's own BUILD.gn, and then
+# this component can depend on them. http://crbug.com/613033
component("media") {
sources = [
"cdm/aes_decryptor.cc",
@@ -120,7 +136,6 @@ component("media") {
"filters/default_media_permission.cc",
"filters/default_media_permission.h",
"filters/file_data_source.cc",
- "filters/file_data_source.h",
"filters/frame_processor.cc",
"filters/frame_processor.h",
"filters/gpu_video_decoder.cc",
@@ -239,7 +254,9 @@ component("media") {
]
public_configs = [ "//third_party/libwebm:libwebm_config" ]
- public_deps = []
+ public_deps = [
+ ":filters_common",
+ ]
include_dirs = [ "." ]
if (media_use_ffmpeg) {
@@ -249,14 +266,12 @@ component("media") {
"filters/audio_file_reader.cc",
"filters/audio_file_reader.h",
"filters/blocking_url_protocol.cc",
- "filters/blocking_url_protocol.h",
"filters/ffmpeg_audio_decoder.cc",
"filters/ffmpeg_audio_decoder.h",
"filters/ffmpeg_bitstream_converter.h",
"filters/ffmpeg_demuxer.cc",
"filters/ffmpeg_demuxer.h",
"filters/ffmpeg_glue.cc",
- "filters/ffmpeg_glue.h",
"filters/ffmpeg_video_decoder.cc",
"filters/ffmpeg_video_decoder.h",
"filters/in_memory_url_protocol.cc",
« no previous file with comments | « no previous file | media/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698