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

webrtc/modules/audio_coding/neteq/neteq.gypi

 # 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.
 
 {
   'variables': {
     'codecs': [
       'cng',
       'g711',
+      'g722',
+      'ilbc',
+      'isac',
+      'isac_fix',
       'pcm16b',
     ],
     'neteq_defines': [],
     'conditions': [
       ['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': [
       '<@(codecs)',
       '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
       '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       'audio_decoder_interface',
     ],
   },
   'targets': [
     {
@@ skipping 77 matching lines @@
   ], # targets
   'conditions': [
     ['include_tests==1', {
       'includes': ['neteq_tests.gypi',],
       'targets': [
         {
           'target_name': 'audio_decoder_unittests',
           'type': '<(gtest_target_type)',
           'dependencies': [
             '<@(codecs)',
-            'g722',
-            'ilbc',
-            'isac',
-            'isac_fix',
             'audio_decoder_interface',
             'neteq_unittest_tools',
             '<(DEPTH)/testing/gtest.gyp:gtest',
             '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
             '<(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': [
             'audio_decoder_impl.cc',
             'audio_decoder_impl.h',
             'audio_decoder_unittest.cc',
           ],
           'conditions': [
             ['OS=="android"', {
               'dependencies': [
@@ skipping 68 matching lines @@
               'sources': [
                 'audio_decoder_unittests.isolate',
               ],
             },
           ],
         }],
       ],
     }], # include_tests
   ], # conditions
 }