Revert of 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 16cdeb3779692620e50009b40982e3611e40adc9..6d0162286dfd504a76c55848f949161e27d6f46e 100644
--- a/webrtc/modules/audio_coding/neteq/neteq.gypi
+++ b/webrtc/modules/audio_coding/neteq/neteq.gypi
@@ -11,6 +11,10 @@
     'codecs': [
       'cng',
       'g711',
+      'g722',
+      'ilbc',
+      'isac',
+      'isac_fix',
       'pcm16b',
     ],
     'neteq_defines': [],
@@ -18,23 +22,6 @@
       ['include_opus==1', {
         'codecs': ['webrtc_opus',],
         'neteq_defines': ['WEBRTC_CODEC_OPUS',],
-      }],
-      ['build_with_mozilla==0', {
-        'conditions': [
-          ['target_arch=="arm"', {
-            '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',],
       }],
     ],
     'neteq_dependencies': [
@@ -133,10 +120,6 @@
           'type': '<(gtest_target_type)',
           'dependencies': [
             '<@(codecs)',
-            'g722',
-            'ilbc',
-            'isac',
-            'isac_fix',
             'audio_decoder_interface',
             'neteq_unittest_tools',
             '<(DEPTH)/testing/gtest.gyp:gtest',
@@ -144,6 +127,11 @@
             '<(webrtc_root)/test/test.gyp:test_support_main',
           ],
           'defines': [
+            'AUDIO_DECODER_UNITTEST',
+            'WEBRTC_CODEC_G722',
+            'WEBRTC_CODEC_ILBC',
+            'WEBRTC_CODEC_ISACFX',
+            'WEBRTC_CODEC_ISAC',
             '<@(neteq_defines)',
           ],
           'sources': [