Declare that rent_a_codec depends on the audio codecs

webrtc/modules/audio_coding/BUILD.gn

 # Copyright (c) 2014 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.
 
 import("//build/config/arm.gni")
 import("../../build/webrtc.gni")
 
+audio_codec_deps = [
+  ":cng",
+  ":g711",
+  ":pcm16b",
+]
+audio_codec_defines = []
+if (rtc_include_ilbc) {
+  audio_codec_defines += [ "WEBRTC_CODEC_ILBC" ]
+  audio_codec_deps += [ ":ilbc" ]
+}
+if (rtc_include_opus) {
+  audio_codec_defines += [ "WEBRTC_CODEC_OPUS" ]
+  audio_codec_deps += [ ":webrtc_opus" ]
+}
+if (!build_with_mozilla) {
+  if (current_cpu == "arm") {
+    audio_codec_defines += [ "WEBRTC_CODEC_ISACFX" ]
+    audio_codec_deps += [ ":isac_fix" ]
+  } else {
+    audio_codec_defines += [ "WEBRTC_CODEC_ISAC" ]
+    audio_codec_deps += [ ":isac" ]
+  }
+  audio_codec_defines += [ "WEBRTC_CODEC_G722" ]
+  audio_codec_deps += [ ":g722" ]
+}
+if (!build_with_mozilla && !build_with_chromium) {
+  audio_codec_defines += [ "WEBRTC_CODEC_RED" ]
+  audio_codec_deps += [ ":red" ]
+}
+
 source_set("rent_a_codec") {
   sources = [
     "acm2/acm_codec_database.cc",
     "acm2/acm_codec_database.h",
     "acm2/rent_a_codec.cc",
     "acm2/rent_a_codec.h",
   ]
   configs += [ "../..:common_config" ]
   public_configs = [ "../..:common_inherited_config" ]
-  deps = [
-    "../..:webrtc_common",
-  ]
-
-  defines = []
-  if (rtc_include_ilbc) {
-    defines += [ "WEBRTC_CODEC_ILBC" ]
-  }
-  if (rtc_include_opus) {
-    defines += [ "WEBRTC_CODEC_OPUS" ]
-  }
-  if (!build_with_mozilla) {
-    if (current_cpu == "arm") {
-      defines += [ "WEBRTC_CODEC_ISACFX" ]
-    } else {
-      defines += [ "WEBRTC_CODEC_ISAC" ]
-    }
-    defines += [ "WEBRTC_CODEC_G722" ]
-  }
-  if (!build_with_mozilla && !build_with_chromium) {
-    defines += [ "WEBRTC_CODEC_RED" ]
-  }
+  deps = [ "../..:webrtc_common" ] + audio_codec_deps
+  defines = audio_codec_defines
 }
 
 config("audio_coding_config") {
   include_dirs = [
     "include",
     "../include",
   ]
 }
 
 source_set("audio_coding") {
@@ skipping 31 matching lines @@
       "/wd4373",  # virtual function override.
     ]
   }
 
   if (is_clang) {
     # Suppress warnings from Chrome's Clang plugins.
     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
     configs -= [ "//build/config/clang:find_bad_constructs" ]
   }
 
-  deps = [
-    ":cng",
-    ":g711",
-    ":neteq",
-    ":pcm16b",
-    ":rent_a_codec",
-    "../..:rtc_event_log",
-    "../..:webrtc_common",
-    "../../common_audio",
-    "../../system_wrappers",
-  ]
-
-  if (rtc_include_ilbc) {
-    defines += [ "WEBRTC_CODEC_ILBC" ]
-    deps += [ ":ilbc" ]
-  }
-  if (rtc_include_opus) {
-    defines += [ "WEBRTC_CODEC_OPUS" ]
-    deps += [ ":webrtc_opus" ]
-  }
-  if (!build_with_mozilla) {
-    if (current_cpu == "arm") {
-      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_RED" ]
-    deps += [ ":red" ]
-  }
+  deps = audio_codec_deps + [

[hlundin-webrtc, 2016/01/19 12:11:34]

Do we still need ACM to depend directly on audio_codec_deps? Wouldn't it suffice
to depend on rent_a_codec?

[kwiberg-webrtc, 2016/01/19 12:21:50]

I think it still needs it for the decoders, but I'm not sure---maybe that's all
located in neteq, which IIRC has its own deps on the codecs.

My evil master plan is to leave those possibly superfluous deps here for now,
and clean them all out at once when the decoders are also in Rent-A-Codec and
nobody else should need those dependencies.

[hlundin-webrtc, 2016/01/19 12:30:15]

Fair enough.

+           ":neteq",
+           ":rent_a_codec",
+           "../..:rtc_event_log",
+           "../..:webrtc_common",
+           "../../common_audio",
+           "../../system_wrappers",
+         ]
+  defines = audio_codec_defines
 }
 
 source_set("audio_decoder_interface") {
   sources = [
     "codecs/audio_decoder.cc",
     "codecs/audio_decoder.h",
   ]
   configs += [ "../..:common_config" ]
   public_configs = [ "../..:common_inherited_config" ]
   deps = [
@@ skipping 722 matching lines @@
       defines += [ "WEBRTC_CODEC_ISACFX" ]
       deps += [ ":isac_fix" ]
     } else {
       defines += [ "WEBRTC_CODEC_ISAC" ]
       deps += [ ":isac" ]
     }
     defines += [ "WEBRTC_CODEC_G722" ]
     deps += [ ":g722" ]
   }
 }