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

Side by Side Diff: content/renderer/BUILD.gn

Issue 1836073003: media: Use "public_configs" for "mojo_media_config" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | media/mojo/services/BUILD.gn » ('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("//build/config/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//content/renderer/renderer.gni") 7 import("//content/renderer/renderer.gni")
8 import("//media/media_options.gni") 8 import("//media/media_options.gni")
9 9
10 source_set("renderer") { 10 source_set("renderer") {
11 # Only the public target should depend on this. All other targets (even 11 # Only the public target should depend on this. All other targets (even
12 # internal content ones) should depend on the public one. 12 # internal content ones) should depend on the public one.
13 visibility = [ 13 visibility = [
14 ":for_content_tests", 14 ":for_content_tests",
15 "//content/public/renderer:renderer_sources", 15 "//content/public/renderer:renderer_sources",
16 ] 16 ]
17 17
18 sources = rebase_path(content_renderer_gypi_values.private_renderer_sources, 18 sources = rebase_path(content_renderer_gypi_values.private_renderer_sources,
19 ".", 19 ".",
20 "//content") 20 "//content")
21 21
22 configs += [ 22 configs += [
23 "//content:content_implementation", 23 "//content:content_implementation",
24 "//build/config/compiler:no_size_t_to_int_warning", 24 "//build/config/compiler:no_size_t_to_int_warning",
25 "//content/public/common:mojo_shell_client", 25 "//content/public/common:mojo_shell_client",
26 ] 26 ]
27
27 defines = [] 28 defines = []
29 public_deps = []
30 public_configs = []
28 31
29 public_deps = []
30 deps = [ 32 deps = [
31 "//base:i18n", 33 "//base:i18n",
32 "//cc", 34 "//cc",
33 "//cc/blink", 35 "//cc/blink",
34 "//cc/proto", 36 "//cc/proto",
35 "//cc/surfaces", 37 "//cc/surfaces",
36 "//cc/surfaces:surface_id", 38 "//cc/surfaces:surface_id",
37 "//components/scheduler:scheduler", 39 "//components/scheduler:scheduler",
38 "//components/url_formatter", 40 "//components/url_formatter",
39 "//content:resources", 41 "//content:resources",
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 } 225 }
224 226
225 if (enable_mojo_media) { 227 if (enable_mojo_media) {
226 sources += [ 228 sources += [
227 "media/media_interface_provider.cc", 229 "media/media_interface_provider.cc",
228 "media/media_interface_provider.h", 230 "media/media_interface_provider.h",
229 ] 231 ]
230 232
231 deps += [ 233 deps += [
232 "//media/mojo/interfaces", 234 "//media/mojo/interfaces",
235
236 # Defines in mojo_media_config are also pulled in here.
233 "//media/mojo/services:proxy", 237 "//media/mojo/services:proxy",
234 ] 238 ]
235 } 239 }
236 240
237 if (enable_webvr) { 241 if (enable_webvr) {
238 sources += [ 242 sources += [
239 "vr/vr_dispatcher.cc", 243 "vr/vr_dispatcher.cc",
240 "vr/vr_dispatcher.h", 244 "vr/vr_dispatcher.h",
241 "vr/vr_type_converters.cc", 245 "vr/vr_type_converters.cc",
242 "vr/vr_type_converters.h", 246 "vr/vr_type_converters.h",
243 ] 247 ]
244 } 248 }
245 249
246 if (use_seccomp_bpf) { 250 if (use_seccomp_bpf) {
247 defines += [ "USE_SECCOMP_BPF" ] 251 defines += [ "USE_SECCOMP_BPF" ]
248 } 252 }
249 253
250 if (use_ozone) { 254 if (use_ozone) {
251 deps += [ "//ui/ozone" ] 255 deps += [ "//ui/ozone" ]
252 } 256 }
253 } 257 }
254 258
255 # See comment at the top of //content/BUILD.gn for how this works. 259 # See comment at the top of //content/BUILD.gn for how this works.
256 group("for_content_tests") { 260 group("for_content_tests") {
257 visibility = [ "//content/test/*" ] 261 visibility = [ "//content/test/*" ]
262
263 if (enable_mojo_media) {
264 # For the defines in mojo_media_config.
265 public_configs = [ "//media/mojo/services:mojo_media_config" ]
xhwang 2016/03/28 21:34:33 Adding this to the "renderer" target doesn't work
266 }
267
258 if (!is_component_build) { 268 if (!is_component_build) {
259 public_deps = [ 269 public_deps = [
260 ":renderer", 270 ":renderer",
261 ] 271 ]
262 } 272 }
263 } 273 }
OLDNEW
« no previous file with comments | « no previous file | media/mojo/services/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698