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

webrtc/modules/audio_coding/neteq/neteq.gypi

Index: webrtc/modules/audio_coding/neteq/neteq.gypi
diff --git a/webrtc/modules/audio_coding/neteq/neteq.gypi b/webrtc/modules/audio_coding/neteq/neteq.gypi
index 6d0162286dfd504a76c55848f949161e27d6f46e..f831923dd4254d6574afd2d62d4c7a362f8d11a4 100644
--- a/webrtc/modules/audio_coding/neteq/neteq.gypi
+++ b/webrtc/modules/audio_coding/neteq/neteq.gypi
@@ -11,18 +11,31 @@
     'codecs': [
       'cng',
       'g711',
-      'g722',
-      'ilbc',
-      'isac',
-      'isac_fix',
       'pcm16b',
     ],
     'neteq_defines': [],
     'conditions': [
-      ['include_opus==1', {
+      ['include_opus == 1', {
         'codecs': ['webrtc_opus',],
         'neteq_defines': ['WEBRTC_CODEC_OPUS',],
       }],
+      ['build_with_mozilla == 0', {
+        'conditions': [
+          ['target_arch == "arm"', {

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

arm64 too.

+            'codecs': ['isac_fix',],
+            'neteq_defines': ['WEBRTC_CODEC_ISACFX',],
+          }, {
+            'codecs': ['isac',],
+            'neteq_defines': ['WEBRTC_CODEC_ISAC',],
+          }],
+        ],
+        'codecs': ['g722',],
+        'neteq_defines': ['WEBRTC_CODEC_G722',],
+      }],
+      ['build_with_mozilla == 0 and build_with_chromium == 0', {
+        'codecs': ['ilbc',],
+        'neteq_defines': ['WEBRTC_CODEC_ILBC',],
+      }],

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

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

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

Removing the duplication in future CL sgtm.

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

Acknowledged.

     ],
     'neteq_dependencies': [
       '<@(codecs)',
@@ -120,6 +133,10 @@
           'type': '<(gtest_target_type)',
           'dependencies': [
             '<@(codecs)',
+            'g722',

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

Aren't these already included in the codecs variable?

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

They used to be unconditionally included in codecs, but after the change earlier
in this file, they're only conditionally included. And audio_decoder_unittests
wants all codecs regardless of whether they're included in the rest of the
WebRTC build.

Lucky for me, it appears that gyp silently accepts listing a dependency twice.

[hlundin-webrtc, 2015/09/22 10:05:55]

Ah, of course.

+            'ilbc',
+            'isac',
+            'isac_fix',
             'audio_decoder_interface',
             'neteq_unittest_tools',
             '<(DEPTH)/testing/gtest.gyp:gtest',
@@ -127,11 +144,6 @@
             '<(webrtc_root)/test/test.gyp:test_support_main',
           ],
           'defines': [
-            'AUDIO_DECODER_UNITTEST',
-            'WEBRTC_CODEC_G722',
-            'WEBRTC_CODEC_ILBC',
-            'WEBRTC_CODEC_ISACFX',
-            'WEBRTC_CODEC_ISAC',

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

the test don't need these?

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

Not anymore (see the change in audio_decoder_impl.h).

             '<@(neteq_defines)',
           ],
           'sources': [