commit 0edb05b3446e92aa90b39fb4dc5a8155eb29dd84
author kwiberg <kwiberg@webrtc.org> Tue Jan 19 05:54:28 2016 -0800
committer Commit bot <commit-bot@chromium.org> Tue Jan 19 13:54:31 2016 +0000
tree e9cea6eadb4085cf510b8e099b9ac746eafe3d0e
parent 73674f80644c0e4bbf8436be8f3b8dedf959d695

Declare that rent_a_codec depends on the audio codecs

That these declarations were missing was a bug, which apparently
didn't actually cause build problems in either Chromium or WebRTC
standalone. (Presumably, because rent_a_codec was always linked
together with other build targets that did declare such dependencies.)

BUG=webrtc:5435

Review URL: https://codereview.webrtc.org/1607463002

Cr-Commit-Position: refs/heads/master@{#11303}

webrtc/modules/audio_coding/audio_coding.gypi

diff --git a/webrtc/modules/audio_coding/audio_coding.gypi b/webrtc/modules/audio_coding/audio_coding.gypi
index d64fbee..e460853 100644
--- a/webrtc/modules/audio_coding/audio_coding.gypi
+++ b/webrtc/modules/audio_coding/audio_coding.gypi
@@ -22,52 +22,61 @@
     'neteq/neteq.gypi',
   ],
   'variables': {
+    'variables': {
+      'audio_codec_dependencies': [
+        'cng',
+        'g711',
+        'pcm16b',
+      ],
+      'audio_codec_defines': [],
+      'conditions': [
+        ['include_ilbc==1', {
+          'audio_codec_dependencies': ['ilbc',],
+          'audio_codec_defines': ['WEBRTC_CODEC_ILBC',],
+        }],
+        ['include_opus==1', {
+          'audio_codec_dependencies': ['webrtc_opus',],
+          'audio_codec_defines': ['WEBRTC_CODEC_OPUS',],
+        }],
+        ['build_with_mozilla==0', {
+          'conditions': [
+            ['target_arch=="arm"', {
+              'audio_codec_dependencies': ['isac_fix',],
+              'audio_codec_defines': ['WEBRTC_CODEC_ISACFX',],
+            }, {
+              'audio_codec_dependencies': ['isac',],
+              'audio_codec_defines': ['WEBRTC_CODEC_ISAC',],
+            }],
+          ],
+          'audio_codec_dependencies': ['g722',],
+          'audio_codec_defines': ['WEBRTC_CODEC_G722',],
+        }],
+        ['build_with_mozilla==0 and build_with_chromium==0', {
+          'audio_codec_dependencies': ['red',],
+          'audio_codec_defines': ['WEBRTC_CODEC_RED',],
+        }],
+      ],
+    },
+    'audio_codec_dependencies': '<(audio_codec_dependencies)',
+    'audio_codec_defines': '<(audio_codec_defines)',
     'audio_coding_dependencies': [
-      'cng',
-      'g711',
-      'pcm16b',
+      '<@(audio_codec_dependencies)',
       '<(webrtc_root)/common.gyp:webrtc_common',
       '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
       '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
     ],
-    'audio_coding_defines': [],
-    'conditions': [
-      ['include_ilbc==1', {
-        'audio_coding_dependencies': ['ilbc',],
-        'audio_coding_defines': ['WEBRTC_CODEC_ILBC',],
-      }],
-      ['include_opus==1', {
-        'audio_coding_dependencies': ['webrtc_opus',],
-        'audio_coding_defines': ['WEBRTC_CODEC_OPUS',],
-      }],
-      ['build_with_mozilla==0', {
-        'conditions': [
-          ['target_arch=="arm"', {
-            'audio_coding_dependencies': ['isac_fix',],
-            'audio_coding_defines': ['WEBRTC_CODEC_ISACFX',],
-          }, {
-            'audio_coding_dependencies': ['isac',],
-            'audio_coding_defines': ['WEBRTC_CODEC_ISAC',],
-          }],
-        ],
-        'audio_coding_dependencies': ['g722',],
-        'audio_coding_defines': ['WEBRTC_CODEC_G722',],
-      }],
-      ['build_with_mozilla==0 and build_with_chromium==0', {
-        'audio_coding_dependencies': ['red',],
-        'audio_coding_defines': ['WEBRTC_CODEC_RED',],
-      }],
-    ],
+    'audio_coding_defines': '<(audio_codec_defines)',
   },
   'targets': [
     {
       'target_name': 'rent_a_codec',
       'type': 'static_library',
       'defines': [
-        '<@(audio_coding_defines)',
+        '<@(audio_codec_defines)',
       ],
       'dependencies': [
         '<(webrtc_root)/common.gyp:webrtc_common',
+        '<@(audio_codec_dependencies)',
       ],
       'include_dirs': [
         '<(webrtc_root)',