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

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

Issue 1320453003: media: Support MojoMediaApplication in GPU process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing import Created 5 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/media_options.gni ('k') | media/mojo/services/mojo_media_application.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 0df256abb61e18ab6a13b2c10d022c150830c793..08b15c9013ace0cf55f60719cb9bb2fc639447a9 100644
--- a/media/mojo/services/BUILD.gn
+++ b/media/mojo/services/BUILD.gn
@@ -15,7 +15,7 @@ import("//mojo/public/mojo_application.gni")
config("enable_mojo_media_config") {
assert(enable_mojo_media == "none" || enable_mojo_media == "browser" ||
- enable_mojo_media == "utility")
+ enable_mojo_media == "gpu" || enable_mojo_media == "utility")
if (enable_mojo_media != "none") {
defines = [ "ENABLE_MOJO_MEDIA" ]
@@ -23,6 +23,8 @@ config("enable_mojo_media_config") {
if (enable_mojo_media == "browser") {
defines += [ "ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS" ]
+ } else if (enable_mojo_media == "gpu") {
+ defines += [ "ENABLE_MOJO_MEDIA_IN_GPU_PROCESS" ]
} else if (enable_mojo_media == "utility") {
defines += [ "ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS" ]
}
@@ -209,7 +211,9 @@ if (!is_component_build) {
"//testing/gtest",
]
- data_deps = [ ":media" ]
+ data_deps = [
+ ":media",
+ ]
}
mojo_native_application("media_pipeline_integration_apptests") {
@@ -219,7 +223,9 @@ if (!is_component_build) {
"//media/test:mojo_pipeline_integration_tests",
]
- data_deps = [ ":media" ]
+ data_deps = [
+ ":media",
+ ]
}
}
« no previous file with comments | « media/media_options.gni ('k') | media/mojo/services/mojo_media_application.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698