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

Unified Diff: media/mojo/services/BUILD.gn

Issue 712463004: media: Support MojoRendererService in the browser process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix BUILD.gn. Created 5 years, 11 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/media_options.gni ('k') | media/mojo/services/mojo_renderer_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/BUILD.gn
diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn
index 88c64d1841cc6fc7f9008ac656f315169b06343b..ca6e36e356d67fbe67986d245270acfac2fc0be3 100644
--- a/media/mojo/services/BUILD.gn
+++ b/media/mojo/services/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//media/media_options.gni")
import("//testing/test.gni")
import("//third_party/mojo/src/mojo/public/mojo_application.gni")
@@ -12,6 +13,12 @@ import("//third_party/mojo/src/mojo/public/mojo_application.gni")
# - unittests: Unit tests for a particular class/file.
# - test: Tests for a particular app, e.g. media.
+config("enable_media_mojo_renderer_config") {
+ if (enable_media_mojo_renderer) {
+ defines = [ "ENABLE_MEDIA_MOJO_RENDERER" ]
+ }
+}
+
source_set("converters") {
sources = [
"media_type_converters.cc",
@@ -41,7 +48,6 @@ source_set("cdm_proxy") {
"//mojo/environment:chromium",
"//third_party/mojo/src/mojo/public/interfaces/application",
"//third_party/mojo/src/mojo/public/c/system:for_component",
- "//third_party/mojo/src/mojo/public/cpp/application",
]
sources = [
@@ -83,6 +89,8 @@ source_set("renderer_proxy") {
"mojo_renderer_impl.h",
]
+ public_configs = [ ":enable_media_mojo_renderer_config" ]
+
deps = [
":converters",
"//base",
@@ -91,7 +99,6 @@ source_set("renderer_proxy") {
"//mojo/common",
"//mojo/environment:chromium",
"//third_party/mojo/src/mojo/public/c/system:for_component",
- "//third_party/mojo/src/mojo/public/cpp/application",
"//third_party/mojo/src/mojo/public/interfaces/application",
]
}
@@ -125,6 +132,8 @@ source_set("renderer_service") {
"renderer_config_default.cc",
]
+ public_configs = [ ":enable_media_mojo_renderer_config" ]
+
deps = [
":renderer_service_generic",
"//base",
« no previous file with comments | « media/media_options.gni ('k') | media/mojo/services/mojo_renderer_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698