GN Templates: Move common_inherited_config to the template.

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 27 matching lines @@
                       "../../common_audio",
                       "../../system_wrappers",
                     ]
 
 rtc_source_set("audio_decoder_factory_interface") {
   sources = [
     "codecs/audio_decoder_factory.h",
     "codecs/audio_format.cc",
     "codecs/audio_format.h",
   ]
-  public_configs = [ "../..:common_inherited_config" ]
   deps = [
     "../..:webrtc_common",
   ]
 }
 
 rtc_source_set("builtin_audio_decoder_factory") {
   sources = [
     "codecs/builtin_audio_decoder_factory.cc",
     "codecs/builtin_audio_decoder_factory.h",
   ]
-  public_configs = [ "../..:common_inherited_config" ]
   deps = [
            "../..:webrtc_common",
            ":audio_decoder_factory_interface",
          ] + audio_codec_deps
   defines = audio_codec_defines
 }
 
 rtc_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",
   ]
-  public_configs = [ "../..:common_inherited_config" ]
   deps = [ "../..:webrtc_common" ] + audio_codec_deps
   defines = audio_codec_defines
 }
 
 config("audio_coding_config") {
   include_dirs = [
     "include",
     "../include",
   ]
 }
@@ skipping 11 matching lines @@
     "acm2/codec_manager.cc",
     "acm2/codec_manager.h",
     "acm2/initial_delay_manager.cc",
     "acm2/initial_delay_manager.h",
     "include/audio_coding_module.h",
     "include/audio_coding_module_typedefs.h",
   ]
 
   defines = []
 
-  public_configs = [
-    "../..:common_inherited_config",
-    ":audio_coding_config",
-  ]
+  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 + [
            ":neteq",
            ":rent_a_codec",
            "../..:rtc_event_log",
          ]
   defines = audio_coding_defines
 }
 
 rtc_source_set("audio_decoder_interface") {
   sources = [
     "codecs/audio_decoder.cc",
     "codecs/audio_decoder.h",
   ]
-  public_configs = [ "../..:common_inherited_config" ]
   deps = [
     "../..:webrtc_common",
     "../../base:rtc_base_approved",
   ]
 }
 
 rtc_source_set("audio_encoder_interface") {
   sources = [
     "codecs/audio_encoder.cc",
     "codecs/audio_encoder.h",
   ]
-  public_configs = [ "../..:common_inherited_config" ]
   deps = [
     "../..:webrtc_common",
     "../../base:rtc_base_approved",
   ]
 }
 
 config("cng_config") {
   include_dirs = [
     "../../..",
     "codecs/cng/include",
   ]
 }
 
 rtc_source_set("cng") {
   sources = [
     "codecs/cng/audio_encoder_cng.cc",
     "codecs/cng/audio_encoder_cng.h",
     "codecs/cng/webrtc_cng.cc",
     "codecs/cng/webrtc_cng.h",
   ]
 
-  public_configs = [
-    "../..:common_inherited_config",
-    ":cng_config",
-  ]
+  public_configs = [ ":cng_config" ]
 
   deps = [
     ":audio_encoder_interface",
     "../../common_audio",
   ]
 }
 
 config("red_config") {
   include_dirs = [ "codecs/red" ]
 }
 
 rtc_source_set("red") {
   sources = [
     "codecs/red/audio_encoder_copy_red.cc",
     "codecs/red/audio_encoder_copy_red.h",
   ]
 
-  public_configs = [
-    "../..:common_inherited_config",
-    ":red_config",
-  ]
+  public_configs = [ ":red_config" ]
 
   deps = [
     ":audio_encoder_interface",
     "../../common_audio",
   ]
 }
 
 config("g711_config") {
   include_dirs = [
     "../../..",
     "codecs/g711/include",
   ]
 }
 
 rtc_source_set("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 = [
-    "../..:common_inherited_config",
-    ":g711_config",
-  ]
+  public_configs = [ ":g711_config" ]
 
   deps = [
     ":audio_decoder_interface",
     ":audio_encoder_interface",
   ]
 }
 
 config("g722_config") {
   include_dirs = [
     "../../..",
     "codecs/g722/include",
   ]
 }
 
 rtc_source_set("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 = [
-    "../..:common_inherited_config",
-    ":g722_config",
-  ]
+  public_configs = [ ":g722_config" ]
 
   deps = [
     ":audio_decoder_interface",
     ":audio_encoder_interface",
   ]
 }
 
 config("ilbc_config") {
   include_dirs = [
     "../../..",
@@ skipping 141 matching lines @@
     "codecs/ilbc/vq3.c",
     "codecs/ilbc/vq3.h",
     "codecs/ilbc/vq4.c",
     "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 = [
-    "../..:common_inherited_config",
-    ":ilbc_config",
-  ]
+  public_configs = [ ":ilbc_config" ]
 
   deps = [
     ":audio_decoder_interface",
     ":audio_encoder_interface",
     "../../base:rtc_base_approved",
     "../../common_audio",
   ]
 }
 
 rtc_source_set("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",
   ]
-  public_configs = [ "../..:common_inherited_config" ]
 }
 
 config("isac_config") {
   include_dirs = [
     "../../..",
     "codecs/isac/main/include",
   ]
 }
 
 rtc_source_set("isac") {
@@ skipping 51 matching lines @@
     "codecs/isac/main/source/spectrum_ar_model_tables.c",
     "codecs/isac/main/source/spectrum_ar_model_tables.h",
     "codecs/isac/main/source/structs.h",
     "codecs/isac/main/source/transform.c",
   ]
 
   if (is_linux) {
     libs = [ "m" ]
   }
 
-  public_configs = [
-    "../..:common_inherited_config",
-    ":isac_config",
-  ]
+  public_configs = [ ":isac_config" ]
 
   deps = [
     ":audio_decoder_interface",
     ":audio_encoder_interface",
     ":isac_common",
     "../..:webrtc_common",
     "../../base:rtc_base_approved",
     "../../common_audio",
   ]
 }
@@ skipping 54 matching lines @@
     "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",
   ]
 
   if (!is_win) {
     defines = [ "WEBRTC_LINUX" ]
   }
 
-  public_configs = [
-    "../..:common_inherited_config",
-    ":isac_fix_config",
-  ]
+  public_configs = [ ":isac_fix_config" ]
 
   deps = [
     ":audio_decoder_interface",
     ":audio_encoder_interface",
     ":isac_common",
     "../../common_audio",
     "../../system_wrappers",
   ]
 
   if (rtc_build_with_neon) {
@@ skipping 56 matching lines @@
 
     # 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",
       ]
     }
 
-    public_configs = [ "../..:common_inherited_config" ]
-
     deps = [
       "../../common_audio",
     ]
   }
 }
 
 config("pcm16b_config") {
   include_dirs = [
     "../../..",
     "codecs/pcm16b/include",
   ]
 }
 
 rtc_source_set("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_configs = [
-    "../..:common_inherited_config",
-    ":pcm16b_config",
-  ]
+  public_configs = [ ":pcm16b_config" ]
 }
 
 config("opus_config") {
   include_dirs = [ "../../.." ]
 }
 
 rtc_source_set("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",
     "../../base:rtc_base_approved",
   ]
 
   if (rtc_build_opus) {
-    public_configs = [ "../..:common_inherited_config" ]
-
     public_deps = [
       rtc_opus_dir,
     ]
   } else if (build_with_mozilla) {
     include_dirs = [ getenv("DIST") + "/include/opus" ]
   }
 }
 
 config("neteq_config") {
   include_dirs = [
@@ skipping 73 matching lines @@
     "neteq/sync_buffer.cc",
     "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",
   ]
 
-  public_configs = [
-    "../..:common_inherited_config",
-    ":neteq_config",
-  ]
+  public_configs = [ ":neteq_config" ]
 
   deps = [
     ":audio_decoder_interface",
     ":builtin_audio_decoder_factory",
     ":cng",
     ":g711",
     ":pcm16b",
     ":rent_a_codec",
     "../..:webrtc_common",
     "../../common_audio",
@@ skipping 24 matching lines @@
 }
 
 if (rtc_include_tests) {
   rtc_source_set("acm_receive_test") {
     testonly = true
     sources = [
       "acm2/acm_receive_test_oldapi.cc",
       "acm2/acm_receive_test_oldapi.h",
     ]
 
-    public_configs = [ "../..:common_inherited_config" ]
-
     defines = audio_coding_defines
 
     deps = audio_coding_deps + [
              ":audio_coding",
              ":neteq_unittest_tools",
              "//testing/gtest",
            ]
   }
 
   rtc_source_set("acm_send_test") {
     testonly = true
     sources = [
       "acm2/acm_send_test_oldapi.cc",
       "acm2/acm_send_test_oldapi.h",
     ]
 
-    public_configs = [ "../..:common_inherited_config" ]
-
     defines = audio_coding_defines
 
     deps = audio_coding_deps + [
              ":audio_coding",
              ":neteq_unittest_tools",
              "//testing/gtest",
            ]
   }
 
   rtc_executable("delay_test") {
     testonly = true
     sources = [
       "test/Channel.cc",
       "test/PCMFile.cc",
       "test/delay_test.cc",
       "test/utility.cc",
     ]
 
-    public_configs = [ "../..:common_inherited_config" ]
-
     deps = [
       ":audio_coding",
       "../../:webrtc_common",
       "../../system_wrappers",
       "../../system_wrappers:system_wrappers_default",
       "../../test:test_support",
       "../rtp_rtcp",
       "//testing/gtest",
       "//third_party/gflags:gflags",
     ]
   }  # delay_test
 
   rtc_executable("insert_packet_with_timing") {
     testonly = true
     sources = [
       "test/Channel.cc",
       "test/PCMFile.cc",
       "test/insert_packet_with_timing.cc",
     ]
 
-    public_configs = [ "../..:common_inherited_config" ]
-
     if (is_clang) {
       # Suppress warnings from Chrome's Clang plugins.
       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
 
     deps = [
       ":audio_coding",
       "../../:webrtc_common",
       "../../system_wrappers",
@@ skipping 19 matching lines @@
       ]
     }
   }
 
   rtc_test("audio_decoder_unittests") {
     testonly = true
     sources = [
       "neteq/audio_decoder_unittest.cc",
     ]
 
-    public_configs = [ "../..:common_inherited_config" ]
-
     if (is_clang) {
       # Suppress warnings from the Chromium Clang plugins (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
 
     deps = []
 
     defines = neteq_defines
 
     deps += audio_coding_deps
@@ skipping 112 matching lines @@
 
   rtc_source_set("neteq_test_support") {
     testonly = true
     sources = [
       "neteq/tools/neteq_external_decoder_test.cc",
       "neteq/tools/neteq_external_decoder_test.h",
       "neteq/tools/neteq_performance_test.cc",
       "neteq/tools/neteq_performance_test.h",
     ]
 
-    public_configs = [ "../..:common_inherited_config" ]
-
     if (is_clang) {
       # Suppress warnings from the Chromium Clang plugins (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
 
     deps = [
       ":neteq",
       ":neteq_unittest_tools",
       ":pcm16b",
       "//testing/gtest",
       "//third_party/gflags",
     ]
   }
 
   rtc_source_set("neteq_quality_test_support") {
     testonly = true
     sources = [
       "neteq/tools/neteq_quality_test.cc",
       "neteq/tools/neteq_quality_test.h",
     ]
 
-    public_configs = [ "../..:common_inherited_config" ]
-
     if (is_clang) {
       # Suppress warnings from the Chromium Clang plugins (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
 
     deps = [
       ":neteq",
       ":neteq_unittest_tools",
       "//testing/gtest",
       "//third_party/gflags",
@@ skipping 32 matching lines @@
       "neteq/tools/packet_source.cc",
       "neteq/tools/packet_source.h",
       "neteq/tools/resample_input_audio_file.cc",
       "neteq/tools/resample_input_audio_file.h",
       "neteq/tools/rtp_file_source.cc",
       "neteq/tools/rtp_file_source.h",
       "neteq/tools/rtp_generator.cc",
       "neteq/tools/rtp_generator.h",
     ]
 
-    public_configs = [
-      "../..:common_inherited_config",
-      ":neteq_unittest_tools_config",
-    ]
+    public_configs = [ ":neteq_unittest_tools_config" ]
 
     if (is_clang) {
       # Suppress warnings from the Chromium Clang plugins (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
 
     deps = [
       "../../common_audio",
       "../../test:rtp_test_utils",
       "../rtp_rtcp",
@@ skipping 317 matching lines @@
     configs += [ ":isac_test_warnings_config" ]
   }
 
   rtc_executable("g711_test") {
     testonly = true
 
     sources = [
       "codecs/g711/test/testG711.cc",
     ]
 
-    public_configs = [ "../..:common_inherited_config" ]
-
     deps = [
       ":g711",
     ]
   }
 
   rtc_executable("g722_test") {
     testonly = true
 
     sources = [
       "codecs/g722/test/testG722.cc",
     ]
 
-    public_configs = [ "../..:common_inherited_config" ]
-
     deps = [
       ":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",
     ]
 
-    public_configs = [ "../..:common_inherited_config" ]
-
     deps = [
       ":isac",
       "../../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",
     ]
 
-    public_configs = [ "../..:common_inherited_config" ]
-
     deps = [
       ":isac",
     ]
 
     include_dirs = [
       "codecs/isac/main/include",
       "codecs/isac/main/test",
       "codecs/isac/main/util",
       "../../common_audio/signal_processing/include",
     ]
   }
 
   rtc_executable("ilbc_test") {
     testonly = true
 
     sources = [
       "codecs/ilbc/test/iLBC_test.c",
     ]
 
-    public_configs = [ "../..:common_inherited_config" ]
-
     deps = [
       ":ilbc",
     ]
   }
 
   rtc_executable("webrtc_opus_fec_test") {
     testonly = true
 
     sources = [
       "codecs/opus/opus_fec_test.cc",
     ]
 
     deps = [
       ":webrtc_opus",
       "../../base:rtc_base_approved",
       "../../common_audio",
       "../../test:test_support",
       "../../test:test_support_main",
       "//testing/gtest",
     ]
 
     if (is_clang) {
       # Suppress warnings from Chrome's Clang plugins.
       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
   }
 }