From 49d0d34ed53ba0fa230ccf80277428a0946ce327 Mon Sep 17 00:00:00 2001 From: "phoglund@webrtc.org" Date: Tue, 10 Mar 2015 16:23:24 +0000 Subject: [PATCH] Making sure neteq gets compiled with OPUS. All WebRTC calls on GN were failing because we failed to add OPUS as a receive codec. The reason was that the WEBRTC_CODEC_OPUS define wasn't set for the audio_decoder_impl.cc file; this CL fixes that. BUG=None R=kjellander@webrtc.org Review URL: https://webrtc-codereview.appspot.com/42309004 Cr-Commit-Position: refs/heads/master@{#8672} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8672 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/audio_coding/BUILD.gn | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn index 6e280da02..b102816f9 100644 --- a/webrtc/modules/audio_coding/BUILD.gn +++ b/webrtc/modules/audio_coding/BUILD.gn @@ -673,6 +673,7 @@ source_set("webrtc_opus") { public_configs = [ "../..:common_inherited_config" ] deps += [ rtc_opus_dir ] + forward_dependent_configs_from = [ rtc_opus_dir ] } } @@ -760,8 +761,6 @@ source_set("neteq") { ":neteq_config", ] - forward_dependent_configs_from = [ rtc_opus_dir ] - if (is_clang) { # Suppress warnings from Chrome's Clang plugins. # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. @@ -780,6 +779,12 @@ source_set("neteq") { "../..:webrtc_common", "../../common_audio", "../../system_wrappers", - rtc_opus_dir, ] + + defines = [] + + if (rtc_include_opus) { + defines += [ "WEBRTC_CODEC_OPUS" ] + deps += [ ":webrtc_opus" ] + } }