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

webrtc/modules/audio_coding/BUILD.gn

Index: webrtc/modules/audio_coding/BUILD.gn
diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index 5725ec03df4d5be9cbb5c8087793f29ad0de436a..b1d8cebdec84fda9bac57d72d9e73a0829d15f97 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -67,13 +67,8 @@ source_set("audio_coding") {
   deps = [
     ":cng",
     ":g711",
-    ":g722",
-    ":ilbc",
-    ":isac",
-    ":isac_fix",
     ":neteq",
     ":pcm16b",
-    ":red",
     "../..:rtc_event_log",
     "../..:webrtc_common",
     "../../common_audio",
@@ -84,6 +79,27 @@ source_set("audio_coding") {
     defines += [ "WEBRTC_CODEC_OPUS" ]
     deps += [ ":webrtc_opus" ]
   }
+  if (!build_with_mozilla) {

[kjellander_webrtc, 2015/09/22 11:01:28]

Since line 82-92 is duplicated below, maybe you can move it to its own config
target and depend on it? I'm not entirely sure it'll end up with the same
behavior, but I think it might.

[kwiberg-webrtc, 2015/09/22 12:05:14]

Will do this in a later CL (see discussion below).

+    if (current_cpu == "arm") {

[kjellander_webrtc, 2015/09/22 11:01:28]

or current_cpu=="arm64" ?

[kwiberg-webrtc, 2015/09/22 12:05:14]

Well, that might make sense. But it won't preserve the current behavior; see the
removed code in engine_configurations.h. There, things are conditional on
WEBRTC_ARCH_ARM, which is set iff current_cpu=="arm" (gn) or target_cpu=="arm".)

So it doesn't seem like a good move to do that in this CL. And since it's
performance needs that made us choose iSAC for arm, it's not obvious (at least
to me) that arm64 should automatically be treated the same without investigating
the pros and cons first.

Other Henrik, what's your opinion?

[kjellander_webrtc, 2015/09/22 12:35:25]

I see. I thought WEBRTC_ARCH_ARM was defined for both. My mistake.

+      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") {
@@ -788,10 +804,6 @@ source_set("neteq") {
     ":audio_decoder_interface",
     ":cng",
     ":g711",
-    ":g722",
-    ":ilbc",
-    ":isac",
-    ":isac_fix",
     ":pcm16b",
     "../..:webrtc_common",
     "../../common_audio",
@@ -804,4 +816,19 @@ source_set("neteq") {
     defines += [ "WEBRTC_CODEC_OPUS" ]
     deps += [ ":webrtc_opus" ]
   }
+  if (!build_with_mozilla) {
+    if (current_cpu == "arm") {

[kjellander_webrtc, 2015/09/22 11:01:28]

arm64 as well.

[kwiberg-webrtc, 2015/09/22 12:05:14]

Not in this CL; see above.

[kjellander_webrtc, 2015/09/22 12:35:25]

Fair enough.

+      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" ]
+  }

[kwiberg-webrtc, 2015/09/22 08:37:15]

This duplication will go away soon; I'm just about to start working on
collecting all the built-in codecs in a single place.

[hlundin-webrtc, 2015/09/22 09:09:17]

Acknowledged.

 }