Split targets mixing .c and .cc sources.

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/webrtc.gni")
 import("audio_coding.gni")
@@ skipping 207 matching lines @@
     "codecs/g711/include",
   ]
 }
 
 rtc_static_library("g711") {
   sources = [
     "codecs/g711/audio_decoder_pcm.cc",
     "codecs/g711/audio_decoder_pcm.h",
     "codecs/g711/audio_encoder_pcm.cc",
     "codecs/g711/audio_encoder_pcm.h",
-    "codecs/g711/g711.c",
-    "codecs/g711/g711.h",
-    "codecs/g711/g711_interface.c",
-    "codecs/g711/g711_interface.h",
   ]
 
   public_configs = [ ":g711_config" ]
 
   deps = [
     ":audio_decoder_interface",
     ":audio_encoder_interface",
   ]
+  public_deps = [
+    ":g711_c",
+  ]
+}
+
+rtc_source_set("g711_c") {
+  visibility = [ ":*" ]  # Only targets in this file can depend on this.
+  sources = [
+    "codecs/g711/g711.c",
+    "codecs/g711/g711.h",
+    "codecs/g711/g711_interface.c",
+    "codecs/g711/g711_interface.h",
+  ]
 }
 
 config("g722_config") {
   include_dirs = [
     "../../..",
     "codecs/g722/include",
   ]
 }
 
 rtc_static_library("g722") {
   sources = [
     "codecs/g722/audio_decoder_g722.cc",
     "codecs/g722/audio_decoder_g722.h",
     "codecs/g722/audio_encoder_g722.cc",
     "codecs/g722/audio_encoder_g722.h",
-    "codecs/g722/g722_decode.c",
-    "codecs/g722/g722_enc_dec.h",
-    "codecs/g722/g722_encode.c",
-    "codecs/g722/g722_interface.c",
-    "codecs/g722/g722_interface.h",
   ]
 
   public_configs = [ ":g722_config" ]
 
   deps = [
     ":audio_decoder_interface",
     ":audio_encoder_interface",
   ]
+  public_deps = [
+    ":g722_c",
+  ]
+}
+
+rtc_source_set("g722_c") {
+  visibility = [ ":*" ]  # Only targets in this file can depend on this.
+  sources = [
+    "codecs/g722/g722_decode.c",
+    "codecs/g722/g722_enc_dec.h",
+    "codecs/g722/g722_encode.c",
+    "codecs/g722/g722_interface.c",
+    "codecs/g722/g722_interface.h",
+  ]
 }
 
 config("ilbc_config") {
   include_dirs = [
     "../../..",
     "codecs/ilbc/include",
   ]
 }
 
 rtc_static_library("ilbc") {
   sources = [
+    "codecs/ilbc/audio_decoder_ilbc.cc",
+    "codecs/ilbc/audio_decoder_ilbc.h",
+    "codecs/ilbc/audio_encoder_ilbc.cc",
+    "codecs/ilbc/audio_encoder_ilbc.h",
+  ]
+
+  public_configs = [ ":ilbc_config" ]
+
+  deps = [
+    ":audio_decoder_interface",
+    ":audio_encoder_interface",
+    "../../base:rtc_base_approved",
+    "../../common_audio",
+  ]
+  public_deps = [
+    ":ilbc_c",
+  ]
+}
+
+rtc_source_set("ilbc_c") {
+  visibility = [ ":*" ]  # Only targets in this file can depend on this.
+  sources = [
     "codecs/ilbc/abs_quant.c",
     "codecs/ilbc/abs_quant.h",
     "codecs/ilbc/abs_quant_loop.c",
     "codecs/ilbc/abs_quant_loop.h",
-    "codecs/ilbc/audio_decoder_ilbc.cc",
-    "codecs/ilbc/audio_decoder_ilbc.h",
-    "codecs/ilbc/audio_encoder_ilbc.cc",
-    "codecs/ilbc/audio_encoder_ilbc.h",
     "codecs/ilbc/augmented_cb_corr.c",
     "codecs/ilbc/augmented_cb_corr.h",
     "codecs/ilbc/bw_expand.c",
     "codecs/ilbc/bw_expand.h",
     "codecs/ilbc/cb_construct.c",
     "codecs/ilbc/cb_construct.h",
     "codecs/ilbc/cb_mem_energy.c",
     "codecs/ilbc/cb_mem_energy.h",
     "codecs/ilbc/cb_mem_energy_augmentation.c",
     "codecs/ilbc/cb_mem_energy_augmentation.h",
@@ skipping 120 matching lines @@
     "codecs/ilbc/vq4.h",
     "codecs/ilbc/window32_w32.c",
     "codecs/ilbc/window32_w32.h",
     "codecs/ilbc/xcorr_coef.c",
     "codecs/ilbc/xcorr_coef.h",
   ]
 
   public_configs = [ ":ilbc_config" ]
 
   deps = [
-    ":audio_decoder_interface",
-    ":audio_encoder_interface",
-    "../../base:rtc_base_approved",
     "../../common_audio",
   ]
 }
 
 rtc_static_library("isac_common") {
   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",
   ]
 }
 
 config("isac_config") {
   include_dirs = [
     "../../..",
     "codecs/isac/main/include",
   ]
 }
 
 rtc_static_library("isac") {
   sources = [
+    "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/audio_decoder_isac.cc",
-    "codecs/isac/main/source/audio_encoder_isac.cc",
     "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",
     "codecs/isac/main/source/decode.c",
     "codecs/isac/main/source/decode_bwe.c",
     "codecs/isac/main/source/encode.c",
     "codecs/isac/main/source/encode_lpc_swb.c",
     "codecs/isac/main/source/encode_lpc_swb.h",
@@ skipping 34 matching lines @@
     "codecs/isac/main/source/transform.c",
   ]
 
   if (is_linux) {
     libs = [ "m" ]
   }
 
   public_configs = [ ":isac_config" ]
 
   deps = [
-    ":audio_decoder_interface",
-    ":audio_encoder_interface",
-    ":isac_common",
     "../..:webrtc_common",
     "../../base:rtc_base_approved",
     "../../common_audio",
   ]
 }
 
 config("isac_fix_config") {
   include_dirs = [
     "../../..",
     "codecs/isac/fix/include",
   ]
 }
 
 rtc_static_library("isac_fix") {
   sources = [
+    "codecs/isac/fix/source/audio_decoder_isacfix.cc",
+    "codecs/isac/fix/source/audio_encoder_isacfix.cc",
+  ]
+
+  public_configs = [ ":isac_fix_config" ]
+
+  deps = [
+    ":audio_decoder_interface",
+    ":audio_encoder_interface",
+    ":isac_common",
+    "../../common_audio",
+    "../../system_wrappers",
+  ]
+  public_deps = [
+    ":isac_fix_c",
+  ]
+
+  if (rtc_build_with_neon) {
+    deps += [ ":isac_neon" ]
+  }
+}
+
+rtc_source_set("isac_fix_c") {
+  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/audio_decoder_isacfix.cc",
-    "codecs/isac/fix/source/audio_encoder_isacfix.cc",
     "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",
@@ skipping 23 matching lines @@
     "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",
-    "../../common_audio",
-    "../../system_wrappers",
-  ]
-
-  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 -= [
       "codecs/isac/fix/source/lattice_c.c",
       "codecs/isac/fix/source/pitch_filter_c.c",
     ]
   }
@@ skipping 14 matching lines @@
       sources += [ "codecs/isac/fix/source/filterbanks_mips.c" ]
     }
     if (mips_dsp_rev > 1) {
       sources += [
         "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" ]
     }
   }
+
+  deps = [
+    "../../common_audio",
+  ]
 }
 
 if (rtc_build_with_neon) {
   rtc_static_library("isac_neon") {
     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",
@@ skipping 28 matching lines @@
     "codecs/pcm16b/include",
   ]
 }
 
 rtc_static_library("pcm16b") {
   sources = [
     "codecs/pcm16b/audio_decoder_pcm16b.cc",
     "codecs/pcm16b/audio_decoder_pcm16b.h",
     "codecs/pcm16b/audio_encoder_pcm16b.cc",
     "codecs/pcm16b/audio_encoder_pcm16b.h",
-    "codecs/pcm16b/pcm16b.c",
-    "codecs/pcm16b/pcm16b.h",
   ]
 
   deps = [
     ":audio_decoder_interface",
     ":audio_encoder_interface",
     ":g711",
   ]
+  public_deps = [
+    ":pcm16b_c",
+  ]
+  public_configs = [ ":pcm16b_config" ]
+}
+
+rtc_source_set("pcm16b_c") {
+  visibility = [ ":*" ]  # Only targets in this file can depend on this.
+  sources = [
+    "codecs/pcm16b/pcm16b.c",
+    "codecs/pcm16b/pcm16b.h",
+  ]
 
   public_configs = [ ":pcm16b_config" ]
 }
 
 config("opus_config") {
   include_dirs = [ "../../.." ]
 }
 
 rtc_static_library("webrtc_opus") {
   sources = [
     "codecs/opus/audio_decoder_opus.cc",
     "codecs/opus/audio_decoder_opus.h",
     "codecs/opus/audio_encoder_opus.cc",
     "codecs/opus/audio_encoder_opus.h",
-    "codecs/opus/opus_inst.h",
-    "codecs/opus/opus_interface.c",
-    "codecs/opus/opus_interface.h",
   ]
 
   deps = [
     ":audio_decoder_interface",
     ":audio_encoder_interface",
     ":audio_network_adaptor",
     "../../base:rtc_analytics",
     "../../base:rtc_base_approved",
   ]
+  public_deps = [
+    ":webrtc_opus_c",
+  ]
 
   defines = []
   if (rtc_opus_variable_complexity) {
     defines += [ "WEBRTC_OPUS_VARIABLE_COMPLEXITY=1" ]
   } else {
     defines += [ "WEBRTC_OPUS_VARIABLE_COMPLEXITY=0" ]
   }
 
   if (rtc_build_opus) {
+    public_deps += [ rtc_opus_dir ]
+  } else if (build_with_mozilla) {
+    include_dirs = [ getenv("DIST") + "/include/opus" ]
+  }
+}
+
+rtc_source_set("webrtc_opus_c") {
+  visibility = [ ":*" ]  # Only targets in this file can depend on this.
+  sources = [
+    "codecs/opus/opus_inst.h",
+    "codecs/opus/opus_interface.c",
+    "codecs/opus/opus_interface.h",
+  ]
+
+  if (rtc_build_opus) {
     public_deps = [

[hlundin-webrtc, 2016/12/05 11:37:01]

Make this a one-liner like you did at line 793 above.

[kjellander_webrtc, 2016/12/06 06:41:21]

gn format presubmit check wants it this way. I'm not sure why it differs from
the above.

       rtc_opus_dir,
     ]
   } else if (build_with_mozilla) {
     include_dirs = [ getenv("DIST") + "/include/opus" ]
   }
+
+  deps = [
+    "../../base:rtc_base_approved",
+  ]
 }
 
 if (rtc_enable_protobuf) {
   proto_library("ana_debug_dump_proto") {
     sources = [
       "audio_network_adaptor/debug_dump.proto",
     ]
     proto_out_dir = "webrtc/modules/audio_coding/audio_network_adaptor"
   }
   proto_library("ana_config_proto") {
@@ skipping 822 matching lines @@
   config("isac_test_warnings_config") {
     if (is_win && is_clang) {
       cflags = [
         # Disable warnings failing when compiling with Clang on Windows.
         # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
         "-Wno-format",
       ]
     }
   }
 
+  rtc_source_set("isac_test_util") {
+    testonly = true
+    sources = [
+      "codecs/isac/main/util/utility.c",
+    ]
+  }
+
   rtc_executable("isac_test") {
     testonly = true
 
     sources = [
       "codecs/isac/main/test/simpleKenny.c",
-      "codecs/isac/main/util/utility.c",
     ]
 
     include_dirs = [
       "codecs/isac/main/include",
       "codecs/isac/main/test",
       "codecs/isac/main/util",
     ]
 
     deps = [
       ":isac",
+      ":isac_test_util",
       "../../base:rtc_base_approved",
     ]
 
     configs += [ ":isac_test_warnings_config" ]
   }
 
   rtc_executable("g711_test") {
     testonly = true
 
     sources = [
@@ skipping 16 matching lines @@
       ":g722",
       "../..:webrtc_common",
     ]
   }
 
   rtc_executable("isac_api_test") {
     testonly = true
 
     sources = [
       "codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc",
-      "codecs/isac/main/util/utility.c",
     ]
 
     deps = [
       ":isac",
+      ":isac_test_util",
       "../../base:rtc_base_approved",
     ]
 
     include_dirs = [
       "codecs/isac/main/include",
       "codecs/isac/main/test",
       "codecs/isac/main/util",
     ]
   }
 
   rtc_executable("isac_switch_samprate_test") {
     testonly = true
 
     sources = [
       "codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc",
-      "codecs/isac/main/util/utility.c",
     ]
 
     deps = [
       ":isac",
+      ":isac_test_util",
     ]
 
     include_dirs = [
       "codecs/isac/main/include",
       "codecs/isac/main/test",
       "codecs/isac/main/util",
       "../../common_audio/signal_processing/include",
     ]
   }
 
@@ skipping 24 matching lines @@
       "../../test:test_support_main",
       "//testing/gtest",
     ]
 
     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" ]
     }
   }
 }