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

Side by Side Diff: media/mojo/services/BUILD.gn

Issue 1529063004: Pass MojoMediaClient instance to MojoMediaApplication constructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added bug number Created 5 years 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 unified diff | Download patch
« no previous file with comments | « no previous file | media/mojo/services/default_mojo_media_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//media/media_options.gni") 5 import("//media/media_options.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 import("//mojo/public/mojo_application.gni") 7 import("//mojo/public/mojo_application.gni")
8 8
9 # Target naming conventions: 9 # Target naming conventions:
10 # - converters: C++/Mojo type converters. 10 # - converters: C++/Mojo type converters.
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 "//media", 74 "//media",
75 "//media/mojo/interfaces", 75 "//media/mojo/interfaces",
76 "//mojo/application/public/interfaces", 76 "//mojo/application/public/interfaces",
77 "//mojo/common", 77 "//mojo/common",
78 "//mojo/environment:chromium", 78 "//mojo/environment:chromium",
79 "//mojo/public/c/system:for_component", 79 "//mojo/public/c/system:for_component",
80 ] 80 ]
81 } 81 }
82 82
83 source_set("media_client") { 83 source_set("media_client") {
84 sources = [
85 "mojo_media_client.cc",
86 "mojo_media_client.h",
87 ]
84 if (is_android) { 88 if (is_android) {
85 sources = [ 89 sources += [ "android_mojo_media_client.cc" ]
86 "android_mojo_media_client.cc",
87 ]
88 } else { 90 } else {
89 sources = [ 91 sources += [ "default_mojo_media_client.cc" ]
90 "default_mojo_media_client.cc",
91 ]
92 } 92 }
93 93
94 public_configs = [ ":enable_mojo_media_config" ] 94 public_configs = [ ":enable_mojo_media_config" ]
95 95
96 deps = [ 96 deps = [
97 "//base", 97 "//base",
98 "//media", 98 "//media",
99 "//media:shared_memory_support", 99 "//media:shared_memory_support",
100 ] 100 ]
101 } 101 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 "//media:shared_memory_support", 151 "//media:shared_memory_support",
152 "//media/mojo/interfaces", 152 "//media/mojo/interfaces",
153 "//mojo/common", 153 "//mojo/common",
154 ] 154 ]
155 } 155 }
156 156
157 source_set("application") { 157 source_set("application") {
158 sources = [ 158 sources = [
159 "mojo_media_application.cc", 159 "mojo_media_application.cc",
160 "mojo_media_application.h", 160 "mojo_media_application.h",
161 "mojo_media_client.cc",
162 "mojo_media_client.h",
163 "service_factory_impl.cc", 161 "service_factory_impl.cc",
164 "service_factory_impl.h", 162 "service_factory_impl.h",
165 ] 163 ]
166 164
167 public_configs = [ ":enable_mojo_media_config" ] 165 public_configs = [ ":enable_mojo_media_config" ]
168 166
169 deps = [ 167 deps = [
170 ":cdm_service", 168 ":cdm_service",
171 ":media_client", 169 ":media_client",
172 ":renderer_service", 170 ":renderer_service",
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 ":media_mojo_unittests", 258 ":media_mojo_unittests",
261 ] 259 ]
262 260
263 if (!is_component_build) { 261 if (!is_component_build) {
264 deps += [ 262 deps += [
265 ":media_apptests", 263 ":media_apptests",
266 ":media_pipeline_integration_apptests", 264 ":media_pipeline_integration_apptests",
267 ] 265 ]
268 } 266 }
269 } 267 }
OLDNEW
« no previous file with comments | « no previous file | media/mojo/services/default_mojo_media_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698