Revert of Don't link with audio codecs that we don't use

webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 544 matching lines @@
 }
 
 TEST_F(AudioDecoderIsacFloatTest, SetTargetBitrate) {
   TestSetAndGetTargetBitratesWithFixedCodec(audio_encoder_.get(), 32000);
 }
 
 TEST_F(AudioDecoderIsacSwbTest, EncodeDecode) {
   int tolerance = 19757;
   double mse = 8.18e6;
   int delay = 160;  // Delay from input to output.
+  EXPECT_TRUE(CodecSupported(kDecoderISACswb));
   EncodeDecodeTest(0, tolerance, mse, delay);
   ReInitTest();
   EXPECT_FALSE(decoder_->HasDecodePlc());
 }
 
 TEST_F(AudioDecoderIsacSwbTest, SetTargetBitrate) {
   TestSetAndGetTargetBitratesWithFixedCodec(audio_encoder_.get(), 32000);
 }
 
 // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4198
@@ skipping 93 matching lines @@
   TestOpusSetTargetBitrates(audio_encoder_.get());
 }
 
 TEST(AudioDecoder, CodecSampleRateHz) {
   EXPECT_EQ(8000, CodecSampleRateHz(kDecoderPCMu));
   EXPECT_EQ(8000, CodecSampleRateHz(kDecoderPCMa));
   EXPECT_EQ(8000, CodecSampleRateHz(kDecoderPCMu_2ch));
   EXPECT_EQ(8000, CodecSampleRateHz(kDecoderPCMa_2ch));
   EXPECT_EQ(8000, CodecSampleRateHz(kDecoderILBC));
   EXPECT_EQ(16000, CodecSampleRateHz(kDecoderISAC));
-#ifndef WEBRTC_ARCH_ARM
   EXPECT_EQ(32000, CodecSampleRateHz(kDecoderISACswb));
   EXPECT_EQ(32000, CodecSampleRateHz(kDecoderISACfb));
-#endif
   EXPECT_EQ(8000, CodecSampleRateHz(kDecoderPCM16B));
   EXPECT_EQ(16000, CodecSampleRateHz(kDecoderPCM16Bwb));
   EXPECT_EQ(32000, CodecSampleRateHz(kDecoderPCM16Bswb32kHz));
   EXPECT_EQ(48000, CodecSampleRateHz(kDecoderPCM16Bswb48kHz));
   EXPECT_EQ(8000, CodecSampleRateHz(kDecoderPCM16B_2ch));
   EXPECT_EQ(16000, CodecSampleRateHz(kDecoderPCM16Bwb_2ch));
   EXPECT_EQ(32000, CodecSampleRateHz(kDecoderPCM16Bswb32kHz_2ch));
   EXPECT_EQ(48000, CodecSampleRateHz(kDecoderPCM16Bswb48kHz_2ch));
   EXPECT_EQ(8000, CodecSampleRateHz(kDecoderPCM16B_5ch));
   EXPECT_EQ(16000, CodecSampleRateHz(kDecoderG722));
   EXPECT_EQ(16000, CodecSampleRateHz(kDecoderG722_2ch));
   EXPECT_EQ(-1, CodecSampleRateHz(kDecoderRED));
   EXPECT_EQ(-1, CodecSampleRateHz(kDecoderAVT));
   EXPECT_EQ(8000, CodecSampleRateHz(kDecoderCNGnb));
   EXPECT_EQ(16000, CodecSampleRateHz(kDecoderCNGwb));
   EXPECT_EQ(32000, CodecSampleRateHz(kDecoderCNGswb32kHz));
   EXPECT_EQ(48000, CodecSampleRateHz(kDecoderOpus));
   EXPECT_EQ(48000, CodecSampleRateHz(kDecoderOpus_2ch));
   // TODO(tlegrand): Change 32000 to 48000 below once ACM has 48 kHz support.
   EXPECT_EQ(32000, CodecSampleRateHz(kDecoderCNGswb48kHz));
   EXPECT_EQ(-1, CodecSampleRateHz(kDecoderArbitrary));
 }
 
 TEST(AudioDecoder, CodecSupported) {
-#ifdef WEBRTC_ARCH_ARM
-  static const bool has_isac_swb = false;
-#else
-  static const bool has_isac_swb = true;
-#endif
   EXPECT_TRUE(CodecSupported(kDecoderPCMu));
   EXPECT_TRUE(CodecSupported(kDecoderPCMa));
   EXPECT_TRUE(CodecSupported(kDecoderPCMu_2ch));
   EXPECT_TRUE(CodecSupported(kDecoderPCMa_2ch));
   EXPECT_TRUE(CodecSupported(kDecoderILBC));
   EXPECT_TRUE(CodecSupported(kDecoderISAC));
-  EXPECT_EQ(has_isac_swb, CodecSupported(kDecoderISACswb));
-  EXPECT_EQ(has_isac_swb, CodecSupported(kDecoderISACfb));
+  EXPECT_TRUE(CodecSupported(kDecoderISACswb));
+  EXPECT_TRUE(CodecSupported(kDecoderISACfb));
   EXPECT_TRUE(CodecSupported(kDecoderPCM16B));
   EXPECT_TRUE(CodecSupported(kDecoderPCM16Bwb));
   EXPECT_TRUE(CodecSupported(kDecoderPCM16Bswb32kHz));
   EXPECT_TRUE(CodecSupported(kDecoderPCM16Bswb48kHz));
   EXPECT_TRUE(CodecSupported(kDecoderPCM16B_2ch));
   EXPECT_TRUE(CodecSupported(kDecoderPCM16Bwb_2ch));
   EXPECT_TRUE(CodecSupported(kDecoderPCM16Bswb32kHz_2ch));
   EXPECT_TRUE(CodecSupported(kDecoderPCM16Bswb48kHz_2ch));
   EXPECT_TRUE(CodecSupported(kDecoderPCM16B_5ch));
   EXPECT_TRUE(CodecSupported(kDecoderG722));
   EXPECT_TRUE(CodecSupported(kDecoderG722_2ch));
   EXPECT_TRUE(CodecSupported(kDecoderRED));
   EXPECT_TRUE(CodecSupported(kDecoderAVT));
   EXPECT_TRUE(CodecSupported(kDecoderCNGnb));
   EXPECT_TRUE(CodecSupported(kDecoderCNGwb));
   EXPECT_TRUE(CodecSupported(kDecoderCNGswb32kHz));
   EXPECT_TRUE(CodecSupported(kDecoderCNGswb48kHz));
   EXPECT_TRUE(CodecSupported(kDecoderArbitrary));
   EXPECT_TRUE(CodecSupported(kDecoderOpus));
   EXPECT_TRUE(CodecSupported(kDecoderOpus_2ch));
 }
 
 }  // namespace webrtc