aboutsummaryrefslogtreecommitdiff
path: root/webrtc/modules/audio_conference_mixer
diff options
context:
space:
mode:
authorkjellander@webrtc.org <kjellander@webrtc.org>2014-09-28 17:37:22 +0000
committerkjellander@webrtc.org <kjellander@webrtc.org>2014-09-28 17:37:22 +0000
commitf21ea918ad9e4dcbe7f372fd32d130c082641e36 (patch)
tree0468d9343e5a59c05454e4ef6eefdeca83a119f3 /webrtc/modules/audio_conference_mixer
parent34f2a9ea7245bac103fececfa53e92359680467a (diff)
downloadwebrtc-f21ea918ad9e4dcbe7f372fd32d130c082641e36.tar.gz
GN: Add common configs to all targets.
This is needed to ensure we have the same build with GN as with GYP, since GYP includes the common.gypi on a global level. Several fixes has been needed in the past because some code have been built without the right defines. BUG=3441 R=brettw@chromium.org Review URL: https://webrtc-codereview.appspot.com/28589004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7317 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/modules/audio_conference_mixer')
-rw-r--r--webrtc/modules/audio_conference_mixer/BUILD.gn9
1 files changed, 7 insertions, 2 deletions
diff --git a/webrtc/modules/audio_conference_mixer/BUILD.gn b/webrtc/modules/audio_conference_mixer/BUILD.gn
index a94d005215..31f2e9affd 100644
--- a/webrtc/modules/audio_conference_mixer/BUILD.gn
+++ b/webrtc/modules/audio_conference_mixer/BUILD.gn
@@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
-config("internal_config") {
+config("audio_conference_mixer_config") {
visibility = [ ":*" ] # Only targets in this file can depend on this.
include_dirs = [
"interface",
@@ -31,7 +31,12 @@ source_set("audio_conference_mixer") {
"source/time_scheduler.h",
]
- direct_dependent_configs = [ ":internal_config" ]
+ configs += [ "../..:common_config" ]
+
+ public_configs = [
+ "../..:common_inherited_config",
+ ":audio_conference_mixer_config",
+ ]
if (is_clang) {
# Suppress warnings from Chrome's Clang plugins.