Fix cyclic deps: rent_a_codec<->audio_coding and rent_a_codec<->neteq

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("../../webrtc.gni")
 import("audio_coding.gni")
@@ skipping 47 matching lines @@
   ]
   deps = [
            "../..:webrtc_common",
            "../../base:rtc_base_approved",
            "../../api/audio_codecs:audio_codecs_api",
          ] + audio_codec_deps
   defines = audio_codec_defines
 }
 
 rtc_static_library("rent_a_codec") {
-  # TODO(kjellander): Remove (bugs.webrtc.org/6828)
-  # Gives cyclic dependency with :neteq and :audio_coding if enabled.
-  check_includes = false
-
   sources = [
     "acm2/acm_codec_database.cc",
     "acm2/acm_codec_database.h",
     "acm2/rent_a_codec.cc",
     "acm2/rent_a_codec.h",
   ]
   deps = [
            "../../api/audio_codecs:audio_codecs_api",
            "../..:webrtc_common",
            "../../base:rtc_base_approved",
+           "../../system_wrappers",
+           ":audio_coding_module_typedefs",
+           ":audio_encoder_interface",
+           ":isac_common",
+           ":isac_fix_c",
+           ":neteq_decoder_enum",
          ] + audio_codec_deps
   defines = audio_codec_defines
 }
 
 config("audio_coding_config") {
   include_dirs = [
     "include",
     "../include",
   ]
 }
 
+rtc_source_set("audio_coding_module_typedefs") {
+  sources = [
+    "include/audio_coding_module_typedefs.h",
+  ]
+  deps = [
+    "../..:webrtc_common",
+  ]
+}
+
 rtc_static_library("audio_coding") {
   sources = [
-    "acm2/acm_common_defs.h",
     "acm2/acm_receiver.cc",
     "acm2/acm_receiver.h",
     "acm2/acm_resampler.cc",
     "acm2/acm_resampler.h",
     "acm2/audio_coding_module.cc",
     "acm2/call_statistics.cc",
     "acm2/call_statistics.h",
     "acm2/codec_manager.cc",
     "acm2/codec_manager.h",
     "include/audio_coding_module.h",
-    "include/audio_coding_module_typedefs.h",
   ]
 
   defines = []
 
   public_configs = [ ":audio_coding_config" ]
 
   if (rtc_include_opus) {
     public_deps = [
       ":webrtc_opus",
     ]
   }
 
   if (is_win) {
     cflags = [
       # TODO(kjellander): Bug 261: fix this warning.
       "/wd4373",  # virtual function override.
     ]
   }
 
   deps = audio_coding_deps + [
            "../../api/audio_codecs:audio_codecs_api",
            "../../api/audio_codecs:builtin_audio_decoder_factory",
+           ":audio_coding_module_typedefs",
+           ":audio_encoder_interface",
            ":neteq",
            ":rent_a_codec",
            "../../base:rtc_base_approved",
            "../../logging:rtc_event_log_api",
          ]
   defines = audio_coding_defines
 }
 
 rtc_static_library("legacy_encoded_audio_frame") {
   sources = [
@@ skipping 781 matching lines @@
     ]
     defines = [ "WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP" ]
   }
 
   if (!build_with_chromium && is_clang) {
     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
   }
 }
 
+rtc_source_set("neteq_decoder_enum") {
+  sources = [
+    "neteq/neteq_decoder_enum.cc",
+    "neteq/neteq_decoder_enum.h",
+  ]
+  deps = [
+    "../../api/audio_codecs:audio_codecs_api",
+    "../../base:rtc_base_approved",
+  ]
+}
+
 rtc_static_library("neteq") {
-  # TODO(kjellander): Remove (bugs.webrtc.org/6828)
-  # Cyclic dependency with :audio_coding if enabled.
-  check_includes = false
-
   sources = [
     "neteq/accelerate.cc",
     "neteq/accelerate.h",
     "neteq/audio_decoder_impl.cc",
     "neteq/audio_decoder_impl.h",
     "neteq/audio_multi_vector.cc",
     "neteq/audio_multi_vector.h",
     "neteq/audio_vector.cc",
     "neteq/audio_vector.h",
     "neteq/background_noise.cc",
@@ skipping 55 matching lines @@
     "neteq/sync_buffer.h",
     "neteq/tick_timer.cc",
     "neteq/tick_timer.h",
     "neteq/time_stretch.cc",
     "neteq/time_stretch.h",
     "neteq/timestamp_scaler.cc",
     "neteq/timestamp_scaler.h",
   ]
 
   deps = [
+    ":audio_coding_module_typedefs",
     ":cng",
     ":g711",
     ":isac_fix",
+    ":neteq_decoder_enum",
     ":pcm16b",
-    ":rent_a_codec",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../base:gtest_prod",
     "../../base:rtc_base_approved",
     "../../common_audio",
     "../../system_wrappers",
   ]
 
   defines = []
 
@@ skipping 101 matching lines @@
       "test/TestVADDTX.cc",
       "test/Tester.cc",
       "test/TwoWayCommunication.cc",
       "test/iSACTest.cc",
       "test/opus_test.cc",
       "test/target_delay_unittest.cc",
       "test/utility.cc",
     ]
     deps = [
       ":audio_coding",
+      ":audio_coding_module_typedefs",
       ":audio_format_conversion",
       ":pcm16b_c",
       "../..:webrtc_common",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
       "../../base:rtc_base_approved",
       "../../system_wrappers:system_wrappers",
       "../../test:fileutils",
       "../../test:test_support",
     ]
     defines = audio_coding_defines
@@ skipping 75 matching lines @@
     testonly = true
     sources = [
       "test/Channel.cc",
       "test/PCMFile.cc",
       "test/delay_test.cc",
       "test/utility.cc",
     ]
 
     deps = [
       ":audio_coding",
+      ":audio_coding_module_typedefs",
       ":audio_format_conversion",
       "../../:webrtc_common",
       "../../base:rtc_base_approved",
       "../../system_wrappers",
       "../../system_wrappers:system_wrappers_default",
       "../../test:test_support",
       "../rtp_rtcp",
       "//testing/gtest",
       "//third_party/gflags:gflags",
     ]
@@ skipping 788 matching lines @@
       "neteq/time_stretch_unittest.cc",
       "neteq/timestamp_scaler_unittest.cc",
       "neteq/tools/input_audio_file_unittest.cc",
       "neteq/tools/packet_unittest.cc",
     ]
 
     deps = [
       ":acm_receive_test",
       ":acm_send_test",
       ":audio_coding",
+      ":audio_coding_module_typedefs",
       ":audio_encoder_interface",
       ":audio_format_conversion",
       ":audio_network_adaptor",
       ":cng",
       ":g711",
       ":ilbc",
       ":isac",
       ":isac_c",
       ":isac_fix",
       ":legacy_encoded_audio_frame",
@@ skipping 57 matching lines @@
 # webrtc/api/audio_codecs:builtin_audio_decoder_factory instead.
 # TODO(kwiberg): Remove this.
 rtc_source_set("builtin_audio_decoder_factory") {
   sources = [
     "codecs/builtin_audio_decoder_factory.h",
   ]
   deps = [
     "../../api/audio_codecs:builtin_audio_decoder_factory",
   ]
 }