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

webrtc/modules/audio_coding/BUILD.gn

 # Copyright (c) 2014 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.
 
 import("//build/config/arm.gni")
 import("../../build/webrtc.gni")
@@ skipping 49 matching lines @@
 
   if (is_clang) {
     # Suppress warnings from Chrome's Clang plugins.
     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
     configs -= [ "//build/config/clang:find_bad_constructs" ]
   }
 
   deps = [
     ":cng",
     ":g711",
+    ":g722",
+    ":ilbc",
+    ":isac",
+    ":isac_fix",
     ":neteq",
     ":pcm16b",
+    ":red",
     "../..:rtc_event_log",
     "../..:webrtc_common",
     "../../common_audio",
     "../../system_wrappers",
   ]
 
   if (rtc_include_opus) {
     defines += [ "WEBRTC_CODEC_OPUS" ]
     deps += [ ":webrtc_opus" ]
   }
-  if (!build_with_mozilla) {
-    if (current_cpu == "arm") {
-      defines += [ "WEBRTC_CODEC_ISACFX" ]
-      deps += [ ":isac_fix" ]
-    } else {
-      defines += [ "WEBRTC_CODEC_ISAC" ]
-      deps += [ ":isac" ]
-    }
-    defines += [ "WEBRTC_CODEC_G722" ]
-    deps += [ ":g722" ]
-  }
-  if (!build_with_mozilla && !build_with_chromium) {
-    defines += [
-      "WEBRTC_CODEC_ILBC",
-      "WEBRTC_CODEC_RED",
-    ]
-    deps += [
-      ":ilbc",
-      ":red",
-    ]
-  }
 }
 
 source_set("audio_decoder_interface") {
   sources = [
     "codecs/audio_decoder.cc",
     "codecs/audio_decoder.h",
   ]
   configs += [ "../..:common_config" ]
   public_configs = [ "../..:common_inherited_config" ]
   deps = [
@@ skipping 684 matching lines @@
 
   public_configs = [
     "../..:common_inherited_config",
     ":neteq_config",
   ]
 
   deps = [
     ":audio_decoder_interface",
     ":cng",
     ":g711",
+    ":g722",
+    ":ilbc",
+    ":isac",
+    ":isac_fix",
     ":pcm16b",
     "../..:webrtc_common",
     "../../common_audio",
     "../../system_wrappers",
   ]
 
   defines = []
 
   if (rtc_include_opus) {
     defines += [ "WEBRTC_CODEC_OPUS" ]
     deps += [ ":webrtc_opus" ]
   }
-  if (!build_with_mozilla) {
-    if (current_cpu == "arm") {
-      defines += [ "WEBRTC_CODEC_ISACFX" ]
-      deps += [ ":isac_fix" ]
-    } else {
-      defines += [ "WEBRTC_CODEC_ISAC" ]
-      deps += [ ":isac" ]
-    }
-    defines += [ "WEBRTC_CODEC_G722" ]
-    deps += [ ":g722" ]
-  }
-  if (!build_with_mozilla && !build_with_chromium) {
-    defines += [ "WEBRTC_CODEC_ILBC" ]
-    deps += [ ":ilbc" ]
-  }
 }