From a53e383d7dfb1e655e2b0e082eb26ea0407fb285 Mon Sep 17 00:00:00 2001 From: solenberg Date: Fri, 25 Sep 2015 01:30:56 -0700 Subject: [PATCH] Revert of CodecOwner: Don't look at definitions for classes we don't link with (patchset #1 id:1 of https://codereview.webrtc.org/1364233002/ ) Reason for revert: Breaking Chromium FYI bots. Original issue's description: > CodecOwner: Don't look at definitions for classes we don't link with > > It's good hygiene and just generally the right thing to do. And > apparently at least sometimes required by Microsoft's compiler. > > Committed: https://crrev.com/f4d38ea57aa739b525066b095468cb4af1d2799b > Cr-Commit-Position: refs/heads/master@{#10060} TBR=henrik.lundin@webrtc.org,tommi@webrtc.org,kwiberg@webrtc.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.webrtc.org/1368083002 Cr-Commit-Position: refs/heads/master@{#10068} --- webrtc/modules/audio_coding/main/acm2/codec_owner.cc | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/webrtc/modules/audio_coding/main/acm2/codec_owner.cc b/webrtc/modules/audio_coding/main/acm2/codec_owner.cc index 4dde085fc4..fc584de61f 100644 --- a/webrtc/modules/audio_coding/main/acm2/codec_owner.cc +++ b/webrtc/modules/audio_coding/main/acm2/codec_owner.cc @@ -15,27 +15,15 @@ #include "webrtc/engine_configurations.h" #include "webrtc/modules/audio_coding/codecs/cng/include/audio_encoder_cng.h" #include "webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h" -#ifdef WEBRTC_CODEC_G722 #include "webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h" -#endif -#ifdef WEBRTC_CODEC_ILBC #include "webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h" -#endif -#ifdef WEBRTC_CODEC_ISACFX #include "webrtc/modules/audio_coding/codecs/isac/fix/interface/audio_decoder_isacfix.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/interface/audio_encoder_isacfix.h" -#endif -#ifdef WEBRTC_CODEC_ISAC #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_decoder_isac.h" #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_encoder_isac.h" -#endif -#ifdef WEBRTC_CODEC_OPUS #include "webrtc/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h" -#endif #include "webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b.h" -#ifdef WEBRTC_CODEC_RED #include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h" -#endif namespace webrtc { namespace acm2 {