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

11
webrtc/BUILD.gn
View File

@ -247,7 +247,6 @@ if (!is_ios || !build_with_chromium) {
]
defines = []
public_configs = [ ":common_inherited_config" ]
deps = [
":webrtc_common",
@ -337,8 +336,6 @@ rtc_source_set("webrtc_common") {
"typedefs.h",
]
public_configs = [ ":common_inherited_config" ]
if (is_clang && !is_nacl) {
# Suppress warnings from Chrome's Clang plugins.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
@ -364,7 +361,6 @@ rtc_source_set("rtc_event_log") {
]
defines = []
public_configs = [ ":common_inherited_config" ]
deps = [
":webrtc_common",
@ -389,8 +385,6 @@ if (rtc_enable_protobuf) {
"call/rtc_event_log_parser.h",
]
public_configs = [ ":common_inherited_config" ]
public_deps = [
":rtc_event_log_proto",
":webrtc_common",
@ -583,7 +577,6 @@ if (rtc_include_tests) {
}
configs += [ ":rtc_unittests_config" ]
public_configs = [ ":common_inherited_config" ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin.
@ -632,7 +625,6 @@ if (rtc_include_tests) {
rtc_test("xmllite_xmpp_unittests") {
configs += [ ":rtc_unittests_config" ]
public_configs = [ ":common_inherited_config" ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin.
@ -718,7 +710,6 @@ if (rtc_include_tests) {
rtc_source_set("video_quality_test") {
testonly = true
public_configs = [ ":common_inherited_config" ]
sources = [
"video/video_quality_test.cc",
"video/video_quality_test.h",
@ -768,7 +759,6 @@ if (rtc_include_tests) {
rtc_test("webrtc_perf_tests") {
testonly = true
configs += [ ":rtc_unittests_config" ]
public_configs = [ ":common_inherited_config" ]
sources = [
"call/call_perf_tests.cc",
@ -814,7 +804,6 @@ if (rtc_include_tests) {
rtc_test("webrtc_nonparallel_tests") {
testonly = true
configs += [ ":rtc_unittests_config" ]
public_configs = [ ":common_inherited_config" ]
sources = [
"base/nullsocketserver_unittest.cc",
"base/physicalsocketserver_unittest.cc",

5
webrtc/api/BUILD.gn
View File

@ -26,8 +26,6 @@ rtc_source_set("call_api") {
"call/audio_state.h",
]
public_configs = [ "..:common_inherited_config" ]
deps = [
# TODO(kjellander): Add remaining dependencies when webrtc:4243 is done.
"..:webrtc_common",
@ -119,7 +117,6 @@ rtc_source_set("libjingle_peerconnection") {
]
configs += [ ":libjingle_peerconnection_warnings_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
@ -187,7 +184,6 @@ if (is_android && !build_with_chromium) {
]
configs += [ ":libjingle_peerconnection_jni_warnings_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
@ -366,7 +362,6 @@ if (rtc_include_tests) {
defines = [ "HAVE_SCTP" ]
configs += [ ":peerconnection_unittests_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).

2
webrtc/audio/BUILD.gn
View File

@ -20,8 +20,6 @@ rtc_source_set("audio") {
"scoped_voe_interface.h",
]
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.

7
webrtc/base/BUILD.gn
View File

@ -94,7 +94,6 @@ rtc_static_library("rtc_base_approved") {
defines = []
libs = []
deps = []
public_configs = [ "..:common_inherited_config" ]
all_dependent_configs = [ ":rtc_base_approved_all_dependent_config" ]
sources = [
@ -283,7 +282,6 @@ rtc_static_library("rtc_base") {
]
public_configs = [
"..:common_inherited_config",
":openssl_config",
":rtc_base_config",
]
@ -732,10 +730,7 @@ if (rtc_include_tests) {
"unittest_main.cc",
]
configs += [ ":rtc_base_tests_utils_warnings_config" ]
public_configs = [
"..:common_inherited_config",
":rtc_base_tests_utils_exported_config",
]
public_configs = [ ":rtc_base_tests_utils_exported_config" ]
deps = [
":rtc_base",
"../test:field_trial",

29
webrtc/build/webrtc.gni
View File

@ -162,13 +162,20 @@ rtc_opus_dir = "//third_party/opus"
webrtc_root = get_path_info("../", "abspath")
# Global configuration that should be applied to all WebRTC targets.
# You normally shouldn't need to # include this in your target as it's
# You normally shouldn't need to include this in your target as it's
# automatically included when using the rtc_* templates.
# It sets defines, include paths and compilation warnings accordingly,
# both for WebRTC stand-alone builds and for the scenario when WebRTC
# native code is built as part of Chromium.
rtc_common_config = webrtc_root + ":common_config"
# Global public configuration that should be applied to all WebRTC targets. You
# normally shouldn't need to include this in your target as it's automatically
# included when using the rtc_* templates. It set the defines, include paths and
# compilation warnings that should be propagated to dependents of the targets
# depending on the target having this config.
rtc_common_inherited_config = webrtc_root + ":common_inherited_config"
# Common configs to remove or add in all rtc targets.
rtc_remove_configs = []
rtc_add_configs = [ rtc_common_config ]
@ -204,11 +211,16 @@ template("rtc_test") {
"*",
[
"configs",
"public_configs",
"suppressed_configs",
])
configs += invoker.configs
configs -= rtc_remove_configs
configs -= invoker.suppressed_configs
public_configs = [ rtc_common_inherited_config ]
if (defined(invoker.public_configs)) {
public_configs += invoker.public_configs
}
}
}
@ -218,11 +230,16 @@ template("rtc_source_set") {
"*",
[
"configs",
"public_configs",
"suppressed_configs",
])
configs += invoker.configs
configs -= rtc_remove_configs
configs -= invoker.suppressed_configs
public_configs = [ rtc_common_inherited_config ]
if (defined(invoker.public_configs)) {
public_configs += invoker.public_configs
}
}
}
@ -233,6 +250,7 @@ template("rtc_executable") {
[
"deps",
"configs",
"public_configs",
"suppressed_configs",
])
configs += invoker.configs
@ -242,6 +260,10 @@ template("rtc_executable") {
"//build/config/sanitizers:deps",
]
deps += invoker.deps
public_configs = [ rtc_common_inherited_config ]
if (defined(invoker.public_configs)) {
public_configs += invoker.public_configs
}
}
}
@ -251,10 +273,15 @@ template("rtc_static_library") {
"*",
[
"configs",
"public_configs",
"suppressed_configs",
])
configs += invoker.configs
configs -= rtc_remove_configs
configs -= invoker.suppressed_configs
public_configs = [ rtc_common_inherited_config ]
if (defined(invoker.public_configs)) {
public_configs += invoker.public_configs
}
}
}

2
webrtc/call/BUILD.gn
View File

@ -16,8 +16,6 @@ rtc_source_set("call") {
"transport_adapter.h",
]
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.

11
webrtc/common_audio/BUILD.gn
View File

@ -172,10 +172,7 @@ rtc_source_set("common_audio") {
cflags = [ "/wd4334" ] # Ignore warning on shift operator promotion.
}
public_configs = [
"..:common_inherited_config",
":common_audio_config",
]
public_configs = [ ":common_audio_config" ]
if (is_clang) {
# Suppress warnings from Chrome's Clang plugins.
@ -199,8 +196,6 @@ if (current_cpu == "x86" || current_cpu == "x64") {
cflags = [ "-msse2" ]
}
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.
@ -236,8 +231,6 @@ if (rtc_build_with_neon) {
]
}
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.
@ -284,8 +277,6 @@ if (rtc_include_tests) {
sources += [ "resampler/sinc_resampler_unittest.cc" ]
}
public_configs = [ "..:common_inherited_config" ]
if (rtc_use_openmax_dl) {
defines = [ "RTC_USE_OPENMAX_DL" ]
}

7
webrtc/common_video/BUILD.gn
View File

@ -43,10 +43,7 @@ rtc_source_set("common_video") {
include_dirs = [ "../modules/interface" ]
public_configs = [
"..:common_inherited_config",
":common_video_config",
]
public_configs = [ ":common_video_config" ]
if (is_clang) {
# Suppress warnings from Chrome's Clang plugins.
@ -107,8 +104,6 @@ if (rtc_include_tests) {
"libyuv/libyuv_unittest.cc",
]
public_configs = [ "..:common_inherited_config" ]
# TODO(jschuh): Bug 1348: fix this warning.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]

15
webrtc/examples/BUILD.gn
View File

@ -143,10 +143,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
":warnings_config",
"//build/config/compiler:enable_arc",
]
public_configs = [
"..:common_inherited_config",
":apprtc_common_config",
]
public_configs = [ ":apprtc_common_config" ]
deps = [
"../sdk:rtc_sdk_common_objc",
@ -211,10 +208,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
"//build/config/compiler:enable_arc",
":warnings_config",
]
public_configs = [
"..:common_inherited_config",
":apprtc_signaling_config",
]
public_configs = [ ":apprtc_signaling_config" ]
deps = [
":apprtc_common",
":socketrocket",
@ -360,10 +354,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
"//build/config/compiler:enable_arc",
":socketrocket_warning_config",
]
public_configs = [
"..:common_inherited_config",
":socketrocket_include_config",
]
public_configs = [ ":socketrocket_include_config" ]
libs = [
"CFNetwork.framework",

2
webrtc/libjingle/xmllite/BUILD.gn
View File

@ -43,8 +43,6 @@ rtc_source_set("rtc_xmllite") {
]
}
public_configs = [ "../..:common_inherited_config" ]
if (!build_with_chromium && is_clang) {
# Suppress warnings from Chrome's Clang plugins.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.

5
webrtc/libjingle/xmpp/BUILD.gn
View File

@ -76,10 +76,7 @@ rtc_source_set("rtc_xmpp") {
configs += [ ":xmpp_warnings_config" ]
public_configs = [
"../..:common_inherited_config",
":xmpp_inherited_config",
]
public_configs = [ ":xmpp_inherited_config" ]
if (build_with_chromium) {
if (is_nacl) {

5
webrtc/media/BUILD.gn
View File

@ -119,8 +119,6 @@ rtc_source_set("rtc_media") {
configs += [ ":rtc_media_warnings_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [
@ -163,6 +161,7 @@ rtc_source_set("rtc_media") {
deps += [ "//third_party/usrsctp" ]
}
public_configs = []
if (build_with_chromium) {
deps += [ "../modules/video_capture:video_capture" ]
} else {
@ -248,7 +247,6 @@ if (rtc_include_tests) {
]
configs += [ ":rtc_unittest_main_config" ]
public_configs = [ "..:common_inherited_config" ]
if (rtc_build_libyuv) {
deps += [ "$rtc_libyuv_dir" ]
@ -344,7 +342,6 @@ if (rtc_include_tests) {
]
configs += [ ":rtc_media_unittests_config" ]
public_configs = [ "..:common_inherited_config" ]
if (rtc_use_h264) {
defines += [ "WEBRTC_USE_H264" ]

4
webrtc/modules/BUILD.gn
View File

@ -54,8 +54,6 @@ if (rtc_include_tests) {
rtc_test("modules_tests") {
testonly = true
public_configs = [ "..:common_inherited_config" ]
videoprocessor_defines = []
if (rtc_use_h264) {
videoprocessor_defines += [ "WEBRTC_VIDEOPROCESSOR_H264_TESTS" ]
@ -566,8 +564,6 @@ if (rtc_include_tests) {
deps += [ rtc_libvpx_dir ]
}
public_configs = [ "..:common_inherited_config" ]
# TODO(jschuh): bugs.webrtc.org/1348: fix this warning.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]

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",
]

5
webrtc/modules/audio_conference_mixer/BUILD.gn
View File

@ -31,10 +31,7 @@ rtc_source_set("audio_conference_mixer") {
"source/time_scheduler.h",
]
public_configs = [
"../..:common_inherited_config",
":audio_conference_mixer_config",
]
public_configs = [ ":audio_conference_mixer_config" ]
if (is_clang) {
# Suppress warnings from Chrome's Clang plugins.

10
webrtc/modules/audio_device/BUILD.gn
View File

@ -49,10 +49,7 @@ config("audio_device_warnings_config") {
}
rtc_source_set("audio_device") {
public_configs = [
"../..:common_inherited_config",
":audio_device_config",
]
public_configs = [ ":audio_device_config" ]
deps = [
"../..:webrtc_common",
@ -262,9 +259,6 @@ if (rtc_include_tests && !is_ios) {
"../utility",
"//testing/gtest",
]
public_configs = [
"../..:common_inherited_config",
":audio_device_config",
]
public_configs = [ ":audio_device_config" ]
}
}

5
webrtc/modules/audio_mixer/BUILD.gn
View File

@ -27,10 +27,7 @@ rtc_source_set("audio_mixer") {
"audio_mixer.h",
]
public_configs = [
"../..:common_inherited_config",
":audio_conference_mixer_config",
]
public_configs = [ ":audio_conference_mixer_config" ]
if (is_clang) {
# Suppress warnings from Chrome's Clang plugins.

14
webrtc/modules/audio_processing/BUILD.gn
View File

@ -151,8 +151,6 @@ rtc_source_set("audio_processing") {
"voice_detection_impl.h",
]
public_configs = [ "../..:common_inherited_config" ]
defines = []
deps = [
"../..:webrtc_common",
@ -263,8 +261,6 @@ if (current_cpu == "x86" || current_cpu == "x64") {
cflags = [ "-msse2" ]
}
public_configs = [ "../..:common_inherited_config" ]
if (apm_debug_dump) {
defines = [ "WEBRTC_APM_DEBUG_DUMP=1" ]
} else {
@ -299,8 +295,6 @@ if (rtc_build_with_neon) {
]
}
public_configs = [ "../..:common_inherited_config" ]
deps = [
"../../common_audio",
]
@ -320,8 +314,6 @@ if (rtc_include_tests) {
"test/process_test.cc",
]
public_configs = [ "../..:common_inherited_config" ]
deps = [
":audio_processing",
":audioproc_debug_proto",
@ -341,8 +333,6 @@ if (rtc_include_tests) {
"test/unpack.cc",
]
public_configs = [ "../..:common_inherited_config" ]
deps = [
":audio_processing",
":audioproc_debug_proto",
@ -366,8 +356,6 @@ if (rtc_include_tests) {
"test/wav_based_simulator.h",
]
public_configs = [ "../..:common_inherited_config" ]
deps = [
":audio_processing",
":audioproc_debug_proto",
@ -390,8 +378,6 @@ if (rtc_include_tests) {
"test/test_utils.h",
]
public_configs = [ "../..:common_inherited_config" ]
deps = [
"../../base:rtc_base_approved",
"../../common_audio",

2
webrtc/modules/bitrate_controller/BUILD.gn
View File

@ -18,8 +18,6 @@ rtc_source_set("bitrate_controller") {
"send_side_bandwidth_estimation.h",
]
public_configs = [ "../..:common_inherited_config" ]
# TODO(jschuh): Bug 1348: fix this warning.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]

2
webrtc/modules/congestion_controller/BUILD.gn
View File

@ -18,8 +18,6 @@ rtc_source_set("congestion_controller") {
"probe_bitrate_estimator.h",
]
public_configs = [ "../..:common_inherited_config" ]
# TODO(jschuh): Bug 1348: fix this warning.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]

6
webrtc/modules/desktop_capture/BUILD.gn
View File

@ -22,8 +22,6 @@ rtc_source_set("primitives") {
"desktop_region.cc",
"desktop_region.h",
]
public_configs = [ "../..:common_inherited_config" ]
}
rtc_source_set("desktop_capture") {
@ -148,8 +146,6 @@ rtc_source_set("desktop_capture") {
]
}
public_configs = [ "../..:common_inherited_config" ]
if (is_clang && !is_nacl) {
# Suppress warnings from Chrome's Clang plugins.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
@ -177,8 +173,6 @@ if (use_desktop_capture_differ_sse2) {
"differ_block_sse2.h",
]
public_configs = [ "../..:common_inherited_config" ]
if (is_posix) {
cflags = [ "-msse2" ]
}

5
webrtc/modules/media_file/BUILD.gn
View File

@ -22,10 +22,7 @@ rtc_source_set("media_file") {
"media_file_utility.h",
]
public_configs = [
"../..:common_inherited_config",
":media_file_config",
]
public_configs = [ ":media_file_config" ]
# TODO(jschuh): Bug 1348: fix this warning.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]

2
webrtc/modules/pacing/BUILD.gn
View File

@ -18,8 +18,6 @@ rtc_source_set("pacing") {
"packet_router.h",
]
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.

4
webrtc/modules/remote_bitrate_estimator/BUILD.gn
View File

@ -46,8 +46,6 @@ rtc_source_set("remote_bitrate_estimator") {
defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0" ]
}
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" ]
@ -99,8 +97,6 @@ if (rtc_include_tests) {
defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0" ]
}
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" ]

2
webrtc/modules/rtp_rtcp/BUILD.gn
View File

@ -154,8 +154,6 @@ rtc_source_set("rtp_rtcp") {
"source/vp8_partition_aggregator.h",
]
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.

2
webrtc/modules/utility/BUILD.gn
View File

@ -28,8 +28,6 @@ rtc_source_set("utility") {
"source/process_thread_impl.h",
]
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.

6
webrtc/modules/video_capture/BUILD.gn
View File

@ -33,8 +33,6 @@ rtc_source_set("video_capture_module") {
"../utility",
]
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.
@ -53,8 +51,6 @@ rtc_source_set("video_capture") {
"../../system_wrappers",
]
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.
@ -177,8 +173,6 @@ if (!build_with_chromium) {
all_dependent_configs = [ ":video_capture_internal_impl_config" ]
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.

14
webrtc/modules/video_coding/BUILD.gn
View File

@ -74,8 +74,6 @@ rtc_source_set("video_coding") {
"video_sender.cc",
]
public_configs = [ "../..:common_inherited_config" ]
# TODO(jschuh): Bug 1348: fix this warning.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
@ -114,8 +112,6 @@ rtc_source_set("video_coding_utility") {
"utility/vp8_header_parser.h",
]
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.
@ -134,8 +130,6 @@ rtc_source_set("webrtc_h264") {
"codecs/h264/include/h264.h",
]
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.
@ -227,8 +221,6 @@ rtc_source_set("webrtc_i420") {
"codecs/i420/include/i420.h",
]
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.
@ -258,8 +250,6 @@ rtc_source_set("webrtc_vp8") {
"codecs/vp8/vp8_impl.h",
]
public_configs = [ "../..:common_inherited_config" ]
# TODO(jschuh): Bug 1348: fix this warning.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
@ -291,8 +281,6 @@ rtc_source_set("webrtc_vp9") {
"codecs/vp9/vp9_impl.h",
]
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.
@ -324,8 +312,6 @@ if (rtc_include_tests) {
"codecs/test/videoprocessor.h",
]
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.

5
webrtc/modules/video_processing/BUILD.gn
View File

@ -48,8 +48,6 @@ rtc_source_set("video_processing") {
deps += [ ":video_processing_neon" ]
}
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.
@ -64,8 +62,6 @@ if (build_video_processing_sse2) {
"util/denoiser_filter_sse2.h",
]
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.
@ -88,6 +84,5 @@ if (rtc_build_with_neon) {
suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
cflags = [ "-mfpu=neon" ]
}
public_configs = [ "../..:common_inherited_config" ]
}
}

5
webrtc/p2p/BUILD.gn
View File

@ -95,10 +95,7 @@ rtc_source_set("rtc_p2p") {
]
}
public_configs = [
"..:common_inherited_config",
":rtc_p2p_inherited_config",
]
public_configs = [ ":rtc_p2p_inherited_config" ]
if (build_with_chromium) {
if (is_nacl) {

6
webrtc/pc/BUILD.gn
View File

@ -63,10 +63,7 @@ rtc_source_set("rtc_pc") {
deps += [ "//third_party/libsrtp" ]
}
public_configs = [
"..:common_inherited_config",
":rtc_pc_config",
]
public_configs = [ ":rtc_pc_config" ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
@ -100,7 +97,6 @@ if (rtc_include_tests) {
include_dirs = [ "//third_party/libsrtp/srtp" ]
configs += [ ":rtc_pc_unittests_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).

5
webrtc/sdk/BUILD.gn
View File

@ -23,10 +23,7 @@ if (is_ios || (is_mac && mac_deployment_target == "10.7")) {
"../base:rtc_base",
]
configs += [ "//build/config/compiler:enable_arc" ]
public_configs = [
"..:common_inherited_config",
":rtc_sdk_common_objc_config",
]
public_configs = [ ":rtc_sdk_common_objc_config" ]
sources = [
"objc/Framework/Classes/NSString+StdString.h",
"objc/Framework/Classes/NSString+StdString.mm",

4
webrtc/stats/BUILD.gn
View File

@ -25,8 +25,6 @@ rtc_source_set("rtc_stats") {
"rtcstatsreport.cc",
]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
@ -47,8 +45,6 @@ if (rtc_include_tests) {
"rtcstatsreport_unittest.cc",
]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]

13
webrtc/system_wrappers/BUILD.gn
View File

@ -75,8 +75,6 @@ rtc_source_set("system_wrappers") {
"source/trace_win.h",
]
public_configs = [ "..:common_inherited_config" ]
if (rtc_enable_data_logging) {
sources += [ "source/data_log.cc" ]
} else {
@ -143,8 +141,6 @@ rtc_source_set("field_trial_default") {
"include/field_trial_default.h",
"source/field_trial_default.cc",
]
public_configs = [ "..:common_inherited_config" ]
}
rtc_source_set("metrics_default") {
@ -152,13 +148,9 @@ rtc_source_set("metrics_default") {
"include/metrics_default.h",
"source/metrics_default.cc",
]
public_configs = [ "..:common_inherited_config" ]
}
rtc_source_set("system_wrappers_default") {
public_configs = [ "..:common_inherited_config" ]
deps = [
":field_trial_default",
":metrics_default",
@ -172,7 +164,6 @@ if (is_android) {
"source/cpu_features_android.c",
]
public_configs = [ "..:common_inherited_config" ]
deps = [
"//third_party/android_tools:cpu_features",
]
@ -184,8 +175,6 @@ if (is_linux) {
sources = [
"source/cpu_features_linux.c",
]
public_configs = [ "..:common_inherited_config" ]
}
}
@ -217,8 +206,6 @@ if (rtc_include_tests) {
]
}
public_configs = [ "..:common_inherited_config" ]
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
if (is_clang) {

24
webrtc/test/BUILD.gn
View File

@ -75,7 +75,6 @@ rtc_source_set("channel_transport") {
]
configs += [ ":channel_transport_warnings_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang && !is_nacl) {
# Suppress warnings from the Chromium Clang plugin.
@ -101,8 +100,6 @@ rtc_source_set("video_test_common") {
"frame_utils.h",
]
public_configs = [ "..:common_inherited_config" ]
if (is_clang && !is_nacl) {
# Suppress warnings from the Chromium Clang plugin.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
@ -125,8 +122,6 @@ rtc_source_set("rtp_test_utils") {
"rtp_file_writer.h",
]
public_configs = [ "..:common_inherited_config" ]
if (is_clang && !is_nacl) {
# Suppress warnings from the Chromium Clang plugin.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
@ -152,8 +147,6 @@ rtc_source_set("field_trial") {
"../system_wrappers",
"../system_wrappers:field_trial_default",
]
public_configs = [ "..:common_inherited_config" ]
}
rtc_source_set("test_main") {
@ -169,8 +162,6 @@ rtc_source_set("test_main") {
"//testing/gtest",
"//third_party/gflags",
]
public_configs = [ "..:common_inherited_config" ]
}
rtc_source_set("test_support") {
@ -221,8 +212,6 @@ rtc_source_set("test_support") {
if (is_android) {
deps += [ "//base:base" ]
}
public_configs = [ "..:common_inherited_config" ]
}
# Depend on this target when you want to have test_support but also the
@ -244,8 +233,6 @@ rtc_source_set("test_support_main") {
"//testing/gtest",
"//third_party/gflags",
]
public_configs = [ "..:common_inherited_config" ]
}
# Depend on this target when you want to have test_support and a special
@ -262,8 +249,6 @@ rtc_source_set("test_support_main_threaded_mac") {
"testsupport/mac/run_threaded_main_mac.mm",
]
public_configs = [ "..:common_inherited_config" ]
deps = [
":test_support",
]
@ -312,8 +297,6 @@ rtc_test("test_support_unittests") {
"testsupport/unittest_utils.h",
]
public_configs = [ "..:common_inherited_config" ]
# TODO(jschuh): Bug 1348: fix this warning.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
@ -395,8 +378,6 @@ rtc_source_set("test_common") {
]
}
public_configs = [ "..:common_inherited_config" ]
if (is_clang && !is_nacl) {
# Suppress warnings from the Chromium Clang plugin.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
@ -477,10 +458,7 @@ rtc_source_set("test_renderer") {
]
}
public_configs = [
"..:common_inherited_config",
":test_renderer_exported_config",
]
public_configs = [ ":test_renderer_exported_config" ]
if (is_clang && !is_nacl) {
# Suppress warnings from the Chromium Clang plugin.

2
webrtc/test/fuzzers/BUILD.gn
View File

@ -12,7 +12,6 @@ import("//build_overrides/webrtc.gni")
import("//testing/libfuzzer/fuzzer_test.gni")
rtc_static_library("webrtc_fuzzer_main") {
public_configs = [ "../..:common_inherited_config" ]
sources = [
"webrtc_fuzzer_main.cc",
]
@ -120,7 +119,6 @@ webrtc_fuzzer_test("congestion_controller_feedback_fuzzer") {
}
rtc_source_set("audio_decoder_fuzzer") {
public_configs = [ "../..:common_inherited_config" ]
sources = [
"audio_decoder_fuzzer.cc",
"audio_decoder_fuzzer.h",

24
webrtc/tools/BUILD.gn
View File

@ -31,7 +31,6 @@ rtc_source_set("command_line_parser") {
deps = [
"../base:gtest_prod",
]
public_configs = [ "..:common_inherited_config" ]
}
rtc_source_set("video_quality_analysis") {
@ -40,8 +39,6 @@ rtc_source_set("video_quality_analysis") {
"frame_analyzer/video_quality_analysis.h",
]
public_configs = [ "..:common_inherited_config" ]
deps = [
"../common_video",
]
@ -55,8 +52,6 @@ rtc_executable("frame_analyzer") {
"frame_analyzer/frame_analyzer.cc",
]
public_configs = [ "..:common_inherited_config" ]
deps = [
":command_line_parser",
":video_quality_analysis",
@ -69,8 +64,6 @@ rtc_executable("psnr_ssim_analyzer") {
"psnr_ssim_analyzer/psnr_ssim_analyzer.cc",
]
public_configs = [ "..:common_inherited_config" ]
deps = [
":command_line_parser",
":video_quality_analysis",
@ -85,8 +78,6 @@ rtc_executable("rgba_to_i420_converter") {
"converter/rgba_to_i420_converter.cc",
]
public_configs = [ "..:common_inherited_config" ]
deps = [
":command_line_parser",
"../common_video",
@ -100,8 +91,6 @@ rtc_source_set("frame_editing_lib") {
"frame_editing/frame_editing_lib.h",
]
public_configs = [ "..:common_inherited_config" ]
# TODO(jschuh): Bug 1348: fix this warning.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
@ -121,8 +110,6 @@ rtc_executable("frame_editor") {
"frame_editing/frame_editing.cc",
]
public_configs = [ "..:common_inherited_config" ]
deps = [
":command_line_parser",
":frame_editing_lib",
@ -135,8 +122,6 @@ rtc_executable("force_mic_volume_max") {
"force_mic_volume_max/force_mic_volume_max.cc",
]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
@ -169,7 +154,6 @@ if (rtc_enable_protobuf) {
"event_log_visualizer/plot_python.cc",
"event_log_visualizer/plot_python.h",
]
public_configs = [ "..:common_inherited_config" ]
if (is_clang && !is_nacl) {
# Suppress warnings from the Chromium Clang plugin.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
@ -200,8 +184,6 @@ if (rtc_include_tests) {
"event_log_visualizer/main.cc",
]
public_configs = [ "..:common_inherited_config" ]
if (is_clang && !is_nacl) {
# Suppress warnings from the Chromium Clang plugin.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
@ -222,8 +204,6 @@ if (rtc_include_tests) {
"agc/activity_metric.cc",
]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
@ -245,8 +225,6 @@ if (rtc_include_tests) {
"e2e_quality/audio/audio_e2e_harness.cc",
]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
@ -286,8 +264,6 @@ if (rtc_include_tests) {
"simple_command_line_parser_unittest.cc",
]
public_configs = [ "..:common_inherited_config" ]
# TODO(jschuh): Bug 1348: fix this warning.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]

2
webrtc/video/BUILD.gn
View File

@ -48,8 +48,6 @@ rtc_source_set("video") {
"vie_remb.h",
]
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.

4
webrtc/voice_engine/BUILD.gn
View File

@ -78,8 +78,6 @@ rtc_source_set("voice_engine") {
]
}
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.
@ -112,8 +110,6 @@ rtc_source_set("level_indicator") {
"level_indicator.h",
]
public_configs = [ "..:common_inherited_config" ]
deps = [
"..:webrtc_common",
"../base:rtc_base_approved",