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

Unified Diff: media/blink/BUILD.gn

Issue 2411433002: Move ENABLE_PEPPER_CDMS to a buildflag header. (Closed)
Patch Set: Fixes Created 4 years, 2 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/base/key_systems_unittest.cc ('k') | media/blink/webcontentdecryptionmodule_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/BUILD.gn
diff --git a/media/blink/BUILD.gn b/media/blink/BUILD.gn
index 19b0b582b08d546c31582ead23fb8eca6116026f..d49ff9ab491e0244c1d535ef8064947df5ca8c38 100644
--- a/media/blink/BUILD.gn
+++ b/media/blink/BUILD.gn
@@ -8,23 +8,6 @@ import("//testing/test.gni")
component("blink") {
output_name = "media_blink"
- deps = [
- "//base",
- "//cc",
- "//cc/blink",
- "//gpu",
- "//media",
- "//media:shared_memory_support",
- "//net",
- "//skia",
- "//third_party/WebKit/public:blink",
- "//ui/gfx",
- "//ui/gfx/geometry",
- "//url",
- ]
-
- defines = [ "MEDIA_BLINK_IMPLEMENTATION" ]
-
sources = [
"active_loader.cc",
"active_loader.h",
@@ -83,6 +66,24 @@ component("blink") {
"websourcebuffer_impl.h",
]
+ defines = [ "MEDIA_BLINK_IMPLEMENTATION" ]
+
+ deps = [
+ "//base",
+ "//cc",
+ "//cc/blink",
+ "//gpu",
+ "//media",
+ "//media:shared_memory_support",
+ "//net",
+ "//ppapi/features",
+ "//skia",
+ "//third_party/WebKit/public:blink",
+ "//ui/gfx",
+ "//ui/gfx/geometry",
+ "//url",
+ ]
+
if (media_use_ffmpeg || !is_android) {
sources += [
"webmediaplayer_impl.cc",
« no previous file with comments | « media/base/key_systems_unittest.cc ('k') | media/blink/webcontentdecryptionmodule_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698