zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GN Templates: Move common_inherited_config to the template.

Browse Source 
Remove common_inherited_config from the targets and add it to the
template instead.

BUG=webrtc:6187
NOTRY=True

Review-Url: https://codereview.webrtc.org/2311843002
Cr-Commit-Position: refs/heads/master@{#14069}
This commit is contained in:
ehmaldonado
2016-09-05 06:10:18 -07:00
committed by Commit bot
parent bd4317263a
commit e9cc686293
39 changed files with 56 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
webrtc/modules/audio_coding/BUILD.gn
View File

@ -45,7 +45,6 @@ rtc_source_set("audio_decoder_factory_interface") {
"codecs/audio_format.cc",
"codecs/audio_format.h",
]
public_configs = [ "../..:common_inherited_config" ]
deps = [
"../..:webrtc_common",
]
@ -56,7 +55,6 @@ rtc_source_set("builtin_audio_decoder_factory") {
"codecs/builtin_audio_decoder_factory.cc",
"codecs/builtin_audio_decoder_factory.h",
]
public_configs = [ "../..:common_inherited_config" ]
deps = [
"../..:webrtc_common",
":audio_decoder_factory_interface",
@ -71,7 +69,6 @@ rtc_source_set("rent_a_codec") {
"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
}
@ -103,10 +100,7 @@ rtc_source_set("audio_coding") {
defines = []
public_configs = [
"../..:common_inherited_config",
":audio_coding_config",
]
public_configs = [ ":audio_coding_config" ]
if (rtc_include_opus) {
public_deps = [
@ -134,7 +128,6 @@ rtc_source_set("audio_decoder_interface") {
"codecs/audio_decoder.cc",
"codecs/audio_decoder.h",
]
public_configs = [ "../..:common_inherited_config" ]
deps = [
"../..:webrtc_common",
"../../base:rtc_base_approved",
@ -146,7 +139,6 @@ rtc_source_set("audio_encoder_interface") {
"codecs/audio_encoder.cc",
"codecs/audio_encoder.h",
]
public_configs = [ "../..:common_inherited_config" ]
deps = [
"../..:webrtc_common",
"../../base:rtc_base_approved",
@ -168,10 +160,7 @@ rtc_source_set("cng") {
"codecs/cng/webrtc_cng.h",
]
public_configs = [
"../..:common_inherited_config",
":cng_config",
]
public_configs = [ ":cng_config" ]
deps = [
":audio_encoder_interface",
@ -189,10 +178,7 @@ rtc_source_set("red") {
"codecs/red/audio_encoder_copy_red.h",
]
public_configs = [
"../..:common_inherited_config",
":red_config",
]
public_configs = [ ":red_config" ]
deps = [
":audio_encoder_interface",
@ -219,10 +205,7 @@ rtc_source_set("g711") {
"codecs/g711/g711_interface.h",
]
public_configs = [
"../..:common_inherited_config",
":g711_config",
]
public_configs = [ ":g711_config" ]
deps = [
":audio_decoder_interface",
@ -250,10 +233,7 @@ rtc_source_set("g722") {
"codecs/g722/g722_interface.h",
]
public_configs = [
"../..:common_inherited_config",
":g722_config",
]
public_configs = [ ":g722_config" ]
deps = [
":audio_decoder_interface",
@ -415,10 +395,7 @@ rtc_source_set("ilbc") {
"codecs/ilbc/xcorr_coef.h",
]
public_configs = [
"../..:common_inherited_config",
":ilbc_config",
]
public_configs = [ ":ilbc_config" ]
deps = [
":audio_decoder_interface",
@ -435,7 +412,6 @@ rtc_source_set("isac_common") {
"codecs/isac/locked_bandwidth_info.cc",
"codecs/isac/locked_bandwidth_info.h",
]
public_configs = [ "../..:common_inherited_config" ]
}
config("isac_config") {
@ -507,10 +483,7 @@ rtc_source_set("isac") {
libs = [ "m" ]
}
public_configs = [
"../..:common_inherited_config",
":isac_config",
]
public_configs = [ ":isac_config" ]
deps = [
":audio_decoder_interface",
@ -585,10 +558,7 @@ rtc_source_set("isac_fix") {
defines = [ "WEBRTC_LINUX" ]
}
public_configs = [
"../..:common_inherited_config",
":isac_fix_config",
]
public_configs = [ ":isac_fix_config" ]
deps = [
":audio_decoder_interface",
@ -665,8 +635,6 @@ if (rtc_build_with_neon) {
]
}
public_configs = [ "../..:common_inherited_config" ]
deps = [
"../../common_audio",
]
@ -696,10 +664,7 @@ rtc_source_set("pcm16b") {
":g711",
]
public_configs = [
"../..:common_inherited_config",
":pcm16b_config",
]
public_configs = [ ":pcm16b_config" ]
}
config("opus_config") {
@ -724,8 +689,6 @@ rtc_source_set("webrtc_opus") {
]
if (rtc_build_opus) {
public_configs = [ "../..:common_inherited_config" ]
public_deps = [
rtc_opus_dir,
]
@ -819,10 +782,7 @@ rtc_source_set("neteq") {
"neteq/timestamp_scaler.h",
]
public_configs = [
"../..:common_inherited_config",
":neteq_config",
]
public_configs = [ ":neteq_config" ]
deps = [
":audio_decoder_interface",
@ -867,8 +827,6 @@ if (rtc_include_tests) {
"acm2/acm_receive_test_oldapi.h",
]
public_configs = [ "../..:common_inherited_config" ]
defines = audio_coding_defines
deps = audio_coding_deps + [
@ -885,8 +843,6 @@ if (rtc_include_tests) {
"acm2/acm_send_test_oldapi.h",
]
public_configs = [ "../..:common_inherited_config" ]
defines = audio_coding_defines
deps = audio_coding_deps + [
@ -905,8 +861,6 @@ if (rtc_include_tests) {
"test/utility.cc",
]
public_configs = [ "../..:common_inherited_config" ]
deps = [
":audio_coding",
"../../:webrtc_common",
@ -927,8 +881,6 @@ if (rtc_include_tests) {
"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.
@ -968,8 +920,6 @@ if (rtc_include_tests) {
"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" ]
@ -1102,8 +1052,6 @@ if (rtc_include_tests) {
"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" ]
@ -1125,8 +1073,6 @@ if (rtc_include_tests) {
"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" ]
@ -1179,10 +1125,7 @@ if (rtc_include_tests) {
"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).
@ -1520,8 +1463,6 @@ if (rtc_include_tests) {
"codecs/g711/test/testG711.cc",
]
public_configs = [ "../..:common_inherited_config" ]
deps = [
":g711",
]
@ -1534,8 +1475,6 @@ if (rtc_include_tests) {
"codecs/g722/test/testG722.cc",
]
public_configs = [ "../..:common_inherited_config" ]
deps = [
":g722",
"../..:webrtc_common",
@ -1550,8 +1489,6 @@ if (rtc_include_tests) {
"codecs/isac/main/util/utility.c",
]
public_configs = [ "../..:common_inherited_config" ]
deps = [
":isac",
"../../base:rtc_base_approved",
@ -1572,8 +1509,6 @@ if (rtc_include_tests) {
"codecs/isac/main/util/utility.c",
]
public_configs = [ "../..:common_inherited_config" ]
deps = [
":isac",
]
@ -1593,8 +1528,6 @@ if (rtc_include_tests) {
"codecs/ilbc/test/iLBC_test.c",
]
public_configs = [ "../..:common_inherited_config" ]
deps = [
":ilbc",
]