iSAC: Untangle some cyclic dependencies

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 59 matching lines @@
     ":audio_format",
 
     # TODO(charujain): Clean this dependency when downstream projects are
     # updated to properly depend on audio_format_conversion target.
     ":audio_format_conversion",
     "../../base:rtc_base_approved",
   ]
 }
 
 rtc_static_library("builtin_audio_decoder_factory") {
-  # TODO(kjellander): Remove (bugs.webrtc.org/6828)
-  # Errors on cyclic dependency with :isac_fix if enabled.
-  check_includes = false
-
   sources = [
     "codecs/builtin_audio_decoder_factory.cc",
     "codecs/builtin_audio_decoder_factory.h",
   ]
   deps = [
            "../..:webrtc_common",
            "../../base:rtc_base_approved",
            ":audio_decoder_factory_interface",
          ] + audio_codec_deps
   defines = audio_codec_defines
@@ skipping 399 matching lines @@
   deps = [
     ":audio_decoder_interface",
     ":audio_encoder_interface",
     "../..:webrtc_common",
     "../../base:rtc_base_approved",
     "../../common_audio",
   ]
 }
 
 rtc_static_library("isac_common") {
-  # TODO(kjellander): Remove (bugs.webrtc.org/6828)
-  # Has a cyclic dependency with :isac if checks are enabled.
-  check_includes = false
-
   sources = [
     "codecs/isac/audio_encoder_isac_t.h",
     "codecs/isac/audio_encoder_isac_t_impl.h",
     "codecs/isac/locked_bandwidth_info.cc",
     "codecs/isac/locked_bandwidth_info.h",
   ]
   deps = [
     ":audio_encoder_interface",
+    "../..:webrtc_common",
     "../../base:rtc_base_approved",
   ]
 }
 
 config("isac_config") {
   include_dirs = [
     "../../..",
     "codecs/isac/main/include",
   ]
 }
 
 rtc_static_library("isac") {
   sources = [
+    "codecs/isac/main/include/audio_decoder_isac.h",
+    "codecs/isac/main/include/audio_encoder_isac.h",
     "codecs/isac/main/source/audio_decoder_isac.cc",
     "codecs/isac/main/source/audio_encoder_isac.cc",
   ]
 
   deps = [
     ":audio_decoder_interface",
     ":audio_encoder_interface",
     ":isac_common",
   ]
   public_deps = [
     ":isac_c",
   ]
 }
 
 rtc_static_library("isac_c") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
   sources = [
-    "codecs/isac/main/include/audio_decoder_isac.h",
-    "codecs/isac/main/include/audio_encoder_isac.h",
     "codecs/isac/main/include/isac.h",
     "codecs/isac/main/source/arith_routines.c",
     "codecs/isac/main/source/arith_routines.h",
     "codecs/isac/main/source/arith_routines_hist.c",
     "codecs/isac/main/source/arith_routines_logist.c",
     "codecs/isac/main/source/bandwidth_estimator.c",
     "codecs/isac/main/source/bandwidth_estimator.h",
     "codecs/isac/main/source/codec.h",
     "codecs/isac/main/source/crc.c",
     "codecs/isac/main/source/crc.h",
@@ skipping 77 matching lines @@
   ]
   public_deps = [
     ":isac_fix_c",
   ]
 
   if (rtc_build_with_neon) {
     deps += [ ":isac_neon" ]
   }
 }
 
+rtc_source_set("isac_fix_common") {
+  visibility = [ ":*" ]  # Only targets in this file can depend on this.
+  sources = [
+    "codecs/isac/fix/source/codec.h",
+    "codecs/isac/fix/source/fft.c",
+    "codecs/isac/fix/source/fft.h",
+    "codecs/isac/fix/source/settings.h",
+  ]
+  public_configs = [ ":isac_fix_config" ]
+}
+
 rtc_source_set("isac_fix_c") {
-  # TODO(kjellander): Remove (bugs.webrtc.org/6828)
-  # Errors on cyclic dependency with :builtin_audio_decoder_factory if enabled.
-  check_includes = false
-
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
   sources = [
     "codecs/isac/fix/include/audio_decoder_isacfix.h",
     "codecs/isac/fix/include/audio_encoder_isacfix.h",
     "codecs/isac/fix/include/isacfix.h",
     "codecs/isac/fix/source/arith_routines.c",
     "codecs/isac/fix/source/arith_routines_hist.c",
     "codecs/isac/fix/source/arith_routines_logist.c",
     "codecs/isac/fix/source/arith_routins.h",
     "codecs/isac/fix/source/bandwidth_estimator.c",
     "codecs/isac/fix/source/bandwidth_estimator.h",
-    "codecs/isac/fix/source/codec.h",
     "codecs/isac/fix/source/decode.c",
     "codecs/isac/fix/source/decode_bwe.c",
     "codecs/isac/fix/source/decode_plc.c",
     "codecs/isac/fix/source/encode.c",
     "codecs/isac/fix/source/entropy_coding.c",
     "codecs/isac/fix/source/entropy_coding.h",
-    "codecs/isac/fix/source/fft.c",
-    "codecs/isac/fix/source/fft.h",
     "codecs/isac/fix/source/filterbank_tables.c",
     "codecs/isac/fix/source/filterbank_tables.h",
     "codecs/isac/fix/source/filterbanks.c",
     "codecs/isac/fix/source/filters.c",
     "codecs/isac/fix/source/initialize.c",
     "codecs/isac/fix/source/isac_fix_type.h",
     "codecs/isac/fix/source/isacfix.c",
     "codecs/isac/fix/source/lattice.c",
     "codecs/isac/fix/source/lattice_c.c",
     "codecs/isac/fix/source/lpc_masking_model.c",
     "codecs/isac/fix/source/lpc_masking_model.h",
     "codecs/isac/fix/source/lpc_tables.c",
     "codecs/isac/fix/source/lpc_tables.h",
     "codecs/isac/fix/source/pitch_estimator.c",
     "codecs/isac/fix/source/pitch_estimator.h",
     "codecs/isac/fix/source/pitch_estimator_c.c",
     "codecs/isac/fix/source/pitch_filter.c",
     "codecs/isac/fix/source/pitch_filter_c.c",
     "codecs/isac/fix/source/pitch_gain_tables.c",
     "codecs/isac/fix/source/pitch_gain_tables.h",
     "codecs/isac/fix/source/pitch_lag_tables.c",
     "codecs/isac/fix/source/pitch_lag_tables.h",
-    "codecs/isac/fix/source/settings.h",
     "codecs/isac/fix/source/spectrum_ar_model_tables.c",
     "codecs/isac/fix/source/spectrum_ar_model_tables.h",
     "codecs/isac/fix/source/structs.h",
     "codecs/isac/fix/source/transform.c",
     "codecs/isac/fix/source/transform_tables.c",
   ]
 
   public_configs = [ ":isac_fix_config" ]
 
   deps = [
     ":audio_decoder_interface",
     ":audio_encoder_interface",
     ":isac_common",
     "../..:webrtc_common",
     "../../base:rtc_base_approved",
     "../../common_audio",
     "../../system_wrappers",
   ]
 
+  public_deps = [
+    ":isac_fix_common",
+  ]
+
   if (rtc_build_with_neon) {
     deps += [ ":isac_neon" ]
   }
 
   if (current_cpu == "arm" && arm_version >= 7) {
     sources += [
       "codecs/isac/fix/source/lattice_armv7.S",
       "codecs/isac/fix/source/pitch_filter_armv6.S",
     ]
     sources -= [
@@ skipping 22 matching lines @@
         "codecs/isac/fix/source/lpc_masking_model_mips.c",
         "codecs/isac/fix/source/pitch_filter_mips.c",
       ]
       sources -= [ "codecs/isac/fix/source/pitch_filter_c.c" ]
     }
   }
 }
 
 if (rtc_build_with_neon) {
   rtc_static_library("isac_neon") {
-    # TODO(mbonadei): Remove (bugs.webrtc.org/6828)
-    # Errors on cyclic dependency with :isac_fix_c if enabled.
-    check_includes = false
-
     sources = [
       "codecs/isac/fix/source/entropy_coding_neon.c",
       "codecs/isac/fix/source/filterbanks_neon.c",
       "codecs/isac/fix/source/filters_neon.c",
       "codecs/isac/fix/source/lattice_neon.c",
       "codecs/isac/fix/source/transform_neon.c",
     ]
 
     if (current_cpu != "arm64") {
       # Enable compilation for the NEON instruction set. This is needed
       # since //build/config/arm.gni only enables NEON for iOS, not Android.
       # This provides the same functionality as webrtc/build/arm_neon.gypi.
       suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
       cflags = [ "-mfpu=neon" ]
     }
 
     # Disable LTO on NEON targets due to compiler bug.
     # TODO(fdegans): Enable this. See crbug.com/408997.
     if (rtc_use_lto) {
       cflags -= [
         "-flto",
         "-ffat-lto-objects",
       ]
     }
 
     deps = [
+      ":isac_fix_common",
       "../../base:rtc_base_approved",
       "../../common_audio",
     ]
   }
 }
 
 config("pcm16b_config") {
   include_dirs = [
     "../../..",
     "codecs/pcm16b/include",
@@ skipping 1227 matching lines @@
       ":acm_send_test",
       ":audio_coding",
       ":audio_decoder_interface",
       ":audio_encoder_interface",
       ":audio_format_conversion",
       ":audio_network_adaptor",
       ":builtin_audio_decoder_factory",
       ":cng",
       ":g711",
       ":ilbc",
+      ":isac",
       ":isac_c",
       ":isac_fix",
       ":neteq",
       ":neteq_test_support",
       ":neteq_unittest_tools",
       ":pcm16b",
       ":red",
       ":rent_a_codec",
       ":webrtc_opus",
       "../..:webrtc_common",
@@ skipping 23 matching lines @@
         ":neteq_unittest_proto",
       ]
     }
 
     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" ]
     }
   }
 }