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

Unified Diff: media/BUILD.gn

Issue 2857953006: Extract CdmManager from MojoCdmService. (Closed)
Patch Set: Switch to component(). Created 3 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/cdm/cdm_manager.h » ('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 8d97ec513ba2e43f871c4a10b1db5d90b40fb9c7..e3608aca5c38589abb960673f354d86a17c967d6 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -377,10 +377,10 @@ component("media") {
}
if (disable_ffmpeg_video_decoders) {
- sources -= [
- "filters/decrypting_video_decoder.cc",
- "filters/decrypting_video_decoder.h",
- ]
+ sources -= [
+ "filters/decrypting_video_decoder.cc",
+ "filters/decrypting_video_decoder.h",
+ ]
}
if (is_android) {
@@ -516,6 +516,20 @@ component("media") {
}
}
+# Must not be a source_set() because CdmManager exposes a static singleton,
+# shared by multiple component()s.
+component("cdm_manager") {
+ sources = [
+ "cdm/cdm_manager.cc",
+ "cdm/cdm_manager.h",
+ ]
+ configs += [ ":media_implementation" ]
xhwang 2017/05/04 20:46:11 Typically we only use this on the "media" target.
sandersd (OOO until July 31) 2017/05/04 21:03:35 I have restricted the visibility and added a comme
+ deps = [
+ ":media",
+ "//base",
+ ]
+}
+
static_library("cdm_paths") {
sources = [
"cdm/cdm_paths.cc",
@@ -659,9 +673,7 @@ source_set("unit_tests") {
]
if (!disable_ffmpeg_video_decoders) {
- sources += [
- "filters/ffmpeg_video_decoder_unittest.cc",
- ]
+ sources += [ "filters/ffmpeg_video_decoder_unittest.cc" ]
}
}
« no previous file with comments | « no previous file | media/cdm/cdm_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698