summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxhwang <xhwang@chromium.org>2016-03-25 21:03:40 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-26 04:04:33 +0000
commit220c7edc3243b54970a13d91c690b2dffc15732d (patch)
tree357836497c5fe6c3e1de4be288c991e2aa4e554b
parentba00e4a1b03fa6ca3f2498397c1e6f1628027b5d (diff)
downloadchromium_src-220c7edc3243b54970a13d91c690b2dffc15732d.zip
chromium_src-220c7edc3243b54970a13d91c690b2dffc15732d.tar.gz
chromium_src-220c7edc3243b54970a13d91c690b2dffc15732d.tar.bz2
media: Use "all_dependent_configs" for "mojo_media_config"
I saw an isssue where "content/renderer:renderer" depends on "media/mojo/services:proxy". Then content_browsertests depends on "content/renderer:renderer". Since mojo_media_config is only a public_config, when content_browsertests includes render_frame_impl.h, the defines in mojo_media_config is not defined. But when "content/renderer:renderer" includes render_frame_impl.h, those defines are defined, causing header file mismatch and weird test failures. BUG=521731 TEST=No test failure. Review URL: https://codereview.chromium.org/1837673002 Cr-Commit-Position: refs/heads/master@{#383442}
-rw-r--r--media/mojo/services/BUILD.gn8
1 files changed, 4 insertions, 4 deletions
diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn
index c917069..7f55172 100644
--- a/media/mojo/services/BUILD.gn
+++ b/media/mojo/services/BUILD.gn
@@ -70,7 +70,7 @@ source_set("proxy") {
"mojo_video_decoder.h",
]
- public_configs = [ ":mojo_media_config" ]
+ all_dependent_configs = [ ":mojo_media_config" ]
deps = [
"//base",
@@ -119,7 +119,7 @@ source_set("cdm_service") {
# which is a bit hacky since we need to access CdmService directly
# from C++ code (AVDA). In the future we'll make those decoders part of
# MojoMediaApplication, then we won't need this.
- public_configs = [ ":mojo_media_config" ]
+ all_dependent_configs = [ ":mojo_media_config" ]
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
}
@@ -172,7 +172,7 @@ source_set("application") {
"service_factory_impl.h",
]
- public_configs = [ ":mojo_media_config" ]
+ all_dependent_configs = [ ":mojo_media_config" ]
deps = [
":audio_decoder_service",
@@ -190,7 +190,7 @@ source_set("application_factory") {
"mojo_media_application_factory.h",
]
- public_configs = [ ":mojo_media_config" ]
+ all_dependent_configs = [ ":mojo_media_config" ]
deps = [
":application",