admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GN Templates: Move common_config to the template.

Browse Source 
Remove common_config from the targets' config and add
it to the template instead.

BUG=webrtc:6187
NOTRY=True

Review-Url: https://codereview.webrtc.org/2300413002
Cr-Commit-Position: refs/heads/master@{#14063}
This commit is contained in:
ehmaldonado 2016-09-05 01:35:44 -07:00 committed by Commit bot
parent 74c10b5a7a
commit 7a2ce0b738
38 changed files with 43 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
webrtc/BUILD.gn
View File

@ -247,7 +247,6 @@ if (!is_ios || !build_with_chromium) {
]
defines = []
configs += [ ":common_config" ]
public_configs = [ ":common_inherited_config" ]
deps = [
@ -338,7 +337,6 @@ rtc_source_set("webrtc_common") {
"typedefs.h",
]
configs += [ ":common_config" ]
public_configs = [ ":common_inherited_config" ]
if (is_clang && !is_nacl) {
@ -366,7 +364,6 @@ rtc_source_set("rtc_event_log") {
]
defines = []
configs += [ ":common_config" ]
public_configs = [ ":common_inherited_config" ]
deps = [
@ -392,7 +389,6 @@ if (rtc_enable_protobuf) {
"call/rtc_event_log_parser.h",
]
configs += [ ":common_config" ]
public_configs = [ ":common_inherited_config" ]
public_deps = [
@ -586,10 +582,7 @@ if (rtc_include_tests) {
]
}
configs += [
":common_config",
":rtc_unittests_config",
]
configs += [ ":rtc_unittests_config" ]
public_configs = [ ":common_inherited_config" ]
if (is_clang) {
@ -638,10 +631,7 @@ if (rtc_include_tests) {
}
rtc_test("xmllite_xmpp_unittests") {
configs += [
":common_config",
":rtc_unittests_config",
]
configs += [ ":rtc_unittests_config" ]
public_configs = [ ":common_inherited_config" ]
if (is_clang) {
@ -728,7 +718,6 @@ if (rtc_include_tests) {
rtc_source_set("video_quality_test") {
testonly = true
configs += [ ":common_config" ]
public_configs = [ ":common_inherited_config" ]
sources = [
"video/video_quality_test.cc",
@ -778,10 +767,7 @@ if (rtc_include_tests) {
rtc_test("webrtc_perf_tests") {
testonly = true
configs += [
":common_config",
":rtc_unittests_config",
]
configs += [ ":rtc_unittests_config" ]
public_configs = [ ":common_inherited_config" ]
if (!is_debug) {
@ -832,10 +818,7 @@ if (rtc_include_tests) {
rtc_test("webrtc_nonparallel_tests") {
testonly = true
configs += [
":common_config",
":rtc_unittests_config",
]
configs += [ ":rtc_unittests_config" ]
public_configs = [ ":common_inherited_config" ]
sources = [
"base/nullsocketserver_unittest.cc",

16
webrtc/api/BUILD.gn
View File

@ -26,7 +26,6 @@ rtc_source_set("call_api") {
"call/audio_state.h",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
deps = [
@ -119,10 +118,7 @@ rtc_source_set("libjingle_peerconnection") {
"webrtcsessiondescriptionfactory.h",
]
configs += [
"..:common_config",
":libjingle_peerconnection_warnings_config",
]
configs += [ ":libjingle_peerconnection_warnings_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
@ -190,10 +186,7 @@ if (is_android && !build_with_chromium) {
"androidvideotracksource.h",
]
configs += [
"..:common_config",
":libjingle_peerconnection_jni_warnings_config",
]
configs += [ ":libjingle_peerconnection_jni_warnings_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
@ -372,10 +365,7 @@ if (rtc_include_tests) {
defines = [ "HAVE_SCTP" ]
configs += [
"..:common_config",
":peerconnection_unittests_config",
]
configs += [ ":peerconnection_unittests_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {

1
webrtc/audio/BUILD.gn
View File

@ -20,7 +20,6 @@ rtc_source_set("audio") {
"scoped_voe_interface.h",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {

8
webrtc/base/BUILD.gn
View File

@ -94,7 +94,6 @@ rtc_static_library("rtc_base_approved") {
defines = []
libs = []
deps = []
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
all_dependent_configs = [ ":rtc_base_approved_all_dependent_config" ]
@ -212,7 +211,6 @@ rtc_static_library("rtc_task_queue") {
public_deps = [
":rtc_base_approved",
]
configs += [ "..:common_config" ]
sources = [
"sequenced_task_checker.h",
@ -280,7 +278,6 @@ rtc_static_library("rtc_base") {
]
configs += [
"..:common_config",
":openssl_config",
":rtc_base_config",
]
@ -734,10 +731,7 @@ if (rtc_include_tests) {
"timedelta.h",
"unittest_main.cc",
]
configs += [
"..:common_config",
":rtc_base_tests_utils_warnings_config",
]
configs += [ ":rtc_base_tests_utils_warnings_config" ]
public_configs = [
"..:common_inherited_config",
":rtc_base_tests_utils_exported_config",

22
webrtc/build/webrtc.gni
View File

@ -161,27 +161,35 @@ rtc_opus_dir = "//third_party/opus"
# different subdirectories.
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
# 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"
# Common configs to remove or add in all rtc targets.
rtc_remove_configs = []
rtc_add_configs = []
rtc_add_configs = [ rtc_common_config ]
set_defaults("rtc_test") {
configs = []
configs = rtc_add_configs
suppressed_configs = []
}
set_defaults("rtc_source_set") {
configs = []
configs = rtc_add_configs
suppressed_configs = []
}
set_defaults("rtc_executable") {
configs = []
configs = rtc_add_configs
suppressed_configs = []
}
set_defaults("rtc_static_library") {
configs = []
configs = rtc_add_configs
suppressed_configs = []
}
@ -194,7 +202,6 @@ template("rtc_test") {
"suppressed_configs",
])
configs += invoker.configs
configs += rtc_add_configs
configs -= rtc_remove_configs
configs -= invoker.suppressed_configs
}
@ -209,7 +216,6 @@ template("rtc_source_set") {
"suppressed_configs",
])
configs += invoker.configs
configs += rtc_add_configs
configs -= rtc_remove_configs
configs -= invoker.suppressed_configs
}
@ -225,7 +231,6 @@ template("rtc_executable") {
"suppressed_configs",
])
configs += invoker.configs
configs += rtc_add_configs
configs -= rtc_remove_configs
configs -= invoker.suppressed_configs
deps = [
@ -244,7 +249,6 @@ template("rtc_static_library") {
"suppressed_configs",
])
configs += invoker.configs
configs += rtc_add_configs
configs -= rtc_remove_configs
configs -= invoker.suppressed_configs
}

2
webrtc/call/BUILD.gn
View File

@ -16,7 +16,6 @@ rtc_source_set("call") {
"transport_adapter.h",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
@ -53,7 +52,6 @@ if (rtc_include_tests) {
"//testing/gmock",
"//testing/gtest",
]
configs += [ "..:common_config" ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.

4
webrtc/common_audio/BUILD.gn
View File

@ -172,8 +172,6 @@ rtc_source_set("common_audio") {
cflags = [ "/wd4334" ] # Ignore warning on shift operator promotion.
}
configs += [ "..:common_config" ]
public_configs = [
"..:common_inherited_config",
":common_audio_config",
@ -238,7 +236,6 @@ if (rtc_build_with_neon) {
]
}
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
@ -287,7 +284,6 @@ if (rtc_include_tests) {
sources += [ "resampler/sinc_resampler_unittest.cc" ]
}
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
if (rtc_use_openmax_dl) {

2
webrtc/common_video/BUILD.gn
View File

@ -43,7 +43,6 @@ rtc_source_set("common_video") {
include_dirs = [ "../modules/interface" ]
configs += [ "..:common_config" ]
public_configs = [
"..:common_inherited_config",
":common_video_config",
@ -108,7 +107,6 @@ if (rtc_include_tests) {
"libyuv/libyuv_unittest.cc",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
# TODO(jschuh): Bug 1348: fix this warning.

9
webrtc/examples/BUILD.gn
View File

@ -140,7 +140,6 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
"objc/AppRTCDemo/common/ARDUtilities.m",
]
configs += [
"..:common_config",
":warnings_config",
"//build/config/compiler:enable_arc",
]
@ -209,7 +208,6 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
"objc/AppRTCDemo/RTCSessionDescription+JSON.m",
]
configs += [
"..:common_config",
"//build/config/compiler:enable_arc",
":warnings_config",
]
@ -299,7 +297,6 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
"objc/AppRTCDemo/mac/APPRTCViewController.m",
]
configs += [
"..:common_config",
"..:common_objc",
"//build/config/compiler:enable_arc",
]
@ -360,7 +357,6 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
"objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.m",
]
configs += [
"..:common_config",
"//build/config/compiler:enable_arc",
":socketrocket_warning_config",
]
@ -413,6 +409,11 @@ if (is_linux || is_win) {
"peerconnection/client/peer_connection_client.cc",
"peerconnection/client/peer_connection_client.h",
]
# TODO(ehmaldonado): Make peerconnection_client compile with the standard
# set of warnings.
# See https://bugs.chromium.org/p/webrtc/issues/detail?id=6306
suppressed_configs += [ rtc_common_config ]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.

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

@ -43,7 +43,6 @@ rtc_source_set("rtc_xmllite") {
]
}
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (!build_with_chromium && is_clang) {

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

@ -74,10 +74,7 @@ rtc_source_set("rtc_xmpp") {
]
}
configs += [
"../..:common_config",
":xmpp_warnings_config",
]
configs += [ ":xmpp_warnings_config" ]
public_configs = [
"../..:common_inherited_config",

15
webrtc/media/BUILD.gn
View File

@ -117,10 +117,7 @@ rtc_source_set("rtc_media") {
"sctp/sctpdataengine.h",
]
configs += [
"..:common_config",
":rtc_media_warnings_config",
]
configs += [ ":rtc_media_warnings_config" ]
public_configs = [ "..:common_inherited_config" ]
@ -250,10 +247,7 @@ if (rtc_include_tests) {
"engine/fakewebrtcvoiceengine.h",
]
configs += [
"..:common_config",
":rtc_unittest_main_config",
]
configs += [ ":rtc_unittest_main_config" ]
public_configs = [ "..:common_inherited_config" ]
if (rtc_build_libyuv) {
@ -349,10 +343,7 @@ if (rtc_include_tests) {
"sctp/sctpdataengine_unittest.cc",
]
configs += [
"..:common_config",
":rtc_media_unittests_config",
]
configs += [ ":rtc_media_unittests_config" ]
public_configs = [ "..:common_inherited_config" ]
if (rtc_use_h264) {

2
webrtc/modules/BUILD.gn
View File

@ -54,7 +54,6 @@ if (rtc_include_tests) {
rtc_test("modules_tests") {
testonly = true
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
videoprocessor_defines = []
@ -567,7 +566,6 @@ if (rtc_include_tests) {
deps += [ rtc_libvpx_dir ]
}
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
# TODO(jschuh): bugs.webrtc.org/1348: fix this warning.

40
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",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps = [
"../..:webrtc_common",
@ -57,7 +56,6 @@ rtc_source_set("builtin_audio_decoder_factory") {
"codecs/builtin_audio_decoder_factory.cc",
"codecs/builtin_audio_decoder_factory.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps = [
"../..:webrtc_common",
@ -73,7 +71,6 @@ rtc_source_set("rent_a_codec") {
"acm2/rent_a_codec.cc",
"acm2/rent_a_codec.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps = [ "../..:webrtc_common" ] + audio_codec_deps
defines = audio_codec_defines
@ -106,8 +103,6 @@ rtc_source_set("audio_coding") {
defines = []
configs += [ "../..:common_config" ]
public_configs = [
"../..:common_inherited_config",
":audio_coding_config",
@ -139,7 +134,6 @@ rtc_source_set("audio_decoder_interface") {
"codecs/audio_decoder.cc",
"codecs/audio_decoder.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps = [
"../..:webrtc_common",
@ -152,7 +146,6 @@ rtc_source_set("audio_encoder_interface") {
"codecs/audio_encoder.cc",
"codecs/audio_encoder.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps = [
"../..:webrtc_common",
@ -175,8 +168,6 @@ rtc_source_set("cng") {
"codecs/cng/webrtc_cng.h",
]
configs += [ "../..:common_config" ]
public_configs = [
"../..:common_inherited_config",
":cng_config",
@ -198,8 +189,6 @@ rtc_source_set("red") {
"codecs/red/audio_encoder_copy_red.h",
]
configs += [ "../..:common_config" ]
public_configs = [
"../..:common_inherited_config",
":red_config",
@ -230,8 +219,6 @@ rtc_source_set("g711") {
"codecs/g711/g711_interface.h",
]
configs += [ "../..:common_config" ]
public_configs = [
"../..:common_inherited_config",
":g711_config",
@ -263,8 +250,6 @@ rtc_source_set("g722") {
"codecs/g722/g722_interface.h",
]
configs += [ "../..:common_config" ]
public_configs = [
"../..:common_inherited_config",
":g722_config",
@ -430,8 +415,6 @@ rtc_source_set("ilbc") {
"codecs/ilbc/xcorr_coef.h",
]
configs += [ "../..:common_config" ]
public_configs = [
"../..:common_inherited_config",
":ilbc_config",
@ -524,8 +507,6 @@ rtc_source_set("isac") {
libs = [ "m" ]
}
configs += [ "../..:common_config" ]
public_configs = [
"../..:common_inherited_config",
":isac_config",
@ -604,8 +585,6 @@ rtc_source_set("isac_fix") {
defines = [ "WEBRTC_LINUX" ]
}
configs += [ "../..:common_config" ]
public_configs = [
"../..:common_inherited_config",
":isac_fix_config",
@ -686,7 +665,6 @@ if (rtc_build_with_neon) {
]
}
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps = [
@ -718,8 +696,6 @@ rtc_source_set("pcm16b") {
":g711",
]
configs += [ "../..:common_config" ]
public_configs = [
"../..:common_inherited_config",
":pcm16b_config",
@ -748,7 +724,6 @@ rtc_source_set("webrtc_opus") {
]
if (rtc_build_opus) {
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
public_deps = [
@ -844,8 +819,6 @@ rtc_source_set("neteq") {
"neteq/timestamp_scaler.h",
]
configs += [ "../..:common_config" ]
public_configs = [
"../..:common_inherited_config",
":neteq_config",
@ -894,7 +867,6 @@ if (rtc_include_tests) {
"acm2/acm_receive_test_oldapi.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
defines = audio_coding_defines
@ -913,7 +885,6 @@ if (rtc_include_tests) {
"acm2/acm_send_test_oldapi.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
defines = audio_coding_defines
@ -934,7 +905,6 @@ if (rtc_include_tests) {
"test/utility.cc",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps = [
@ -957,7 +927,6 @@ if (rtc_include_tests) {
"test/insert_packet_with_timing.cc",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {
@ -999,7 +968,6 @@ if (rtc_include_tests) {
"neteq/audio_decoder_unittest.cc",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {
@ -1134,7 +1102,6 @@ if (rtc_include_tests) {
"neteq/tools/neteq_performance_test.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (!is_debug) {
@ -1163,7 +1130,6 @@ if (rtc_include_tests) {
"neteq/tools/neteq_quality_test.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {
@ -1218,7 +1184,6 @@ if (rtc_include_tests) {
"neteq/tools/rtp_generator.h",
]
configs += [ "../..:common_config" ]
public_configs = [
"../..:common_inherited_config",
":neteq_unittest_tools_config",
@ -1560,7 +1525,6 @@ if (rtc_include_tests) {
"codecs/g711/test/testG711.cc",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps = [
@ -1575,7 +1539,6 @@ if (rtc_include_tests) {
"codecs/g722/test/testG722.cc",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps = [
@ -1592,7 +1555,6 @@ if (rtc_include_tests) {
"codecs/isac/main/util/utility.c",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps = [
@ -1615,7 +1577,6 @@ if (rtc_include_tests) {
"codecs/isac/main/util/utility.c",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps = [
@ -1637,7 +1598,6 @@ if (rtc_include_tests) {
"codecs/ilbc/test/iLBC_test.c",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps = [

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

@ -31,8 +31,6 @@ rtc_source_set("audio_conference_mixer") {
"source/time_scheduler.h",
]
configs += [ "../..:common_config" ]
public_configs = [
"../..:common_inherited_config",
":audio_conference_mixer_config",

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

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

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

@ -27,8 +27,6 @@ rtc_source_set("audio_mixer") {
"audio_mixer.h",
]
configs += [ "../..:common_config" ]
public_configs = [
"../..:common_inherited_config",
":audio_conference_mixer_config",

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

@ -151,7 +151,6 @@ rtc_source_set("audio_processing") {
"voice_detection_impl.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
defines = []
@ -264,7 +263,6 @@ if (current_cpu == "x86" || current_cpu == "x64") {
cflags = [ "-msse2" ]
}
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (apm_debug_dump) {
@ -301,7 +299,6 @@ if (rtc_build_with_neon) {
]
}
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps = [
@ -323,7 +320,6 @@ if (rtc_include_tests) {
"test/process_test.cc",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps = [
@ -345,7 +341,6 @@ if (rtc_include_tests) {
"test/unpack.cc",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps = [
@ -371,7 +366,6 @@ if (rtc_include_tests) {
"test/wav_based_simulator.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps = [
@ -396,7 +390,6 @@ if (rtc_include_tests) {
"test/test_utils.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
deps = [

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

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

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

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

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

@ -148,7 +148,6 @@ rtc_source_set("desktop_capture") {
]
}
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang && !is_nacl) {
@ -178,7 +177,6 @@ if (use_desktop_capture_differ_sse2) {
"differ_block_sse2.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_posix) {

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

@ -22,7 +22,6 @@ rtc_source_set("media_file") {
"media_file_utility.h",
]
configs += [ "../..:common_config" ]
public_configs = [
"../..:common_inherited_config",
":media_file_config",

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

@ -18,7 +18,6 @@ rtc_source_set("pacing") {
"packet_router.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {

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

@ -46,7 +46,6 @@ rtc_source_set("remote_bitrate_estimator") {
defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0" ]
}
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {
@ -100,7 +99,6 @@ if (rtc_include_tests) {
defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0" ]
}
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {

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

@ -154,7 +154,6 @@ rtc_source_set("rtp_rtcp") {
"source/vp8_partition_aggregator.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {

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

@ -28,7 +28,6 @@ rtc_source_set("utility") {
"source/process_thread_impl.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {

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

@ -33,7 +33,6 @@ rtc_source_set("video_capture_module") {
"../utility",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {
@ -54,7 +53,6 @@ rtc_source_set("video_capture") {
"../../system_wrappers",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {
@ -179,7 +177,6 @@ if (!build_with_chromium) {
all_dependent_configs = [ ":video_capture_internal_impl_config" ]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {

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

@ -74,7 +74,6 @@ rtc_source_set("video_coding") {
"video_sender.cc",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
# TODO(jschuh): Bug 1348: fix this warning.
@ -115,7 +114,6 @@ rtc_source_set("video_coding_utility") {
"utility/vp8_header_parser.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {
@ -136,7 +134,6 @@ rtc_source_set("webrtc_h264") {
"codecs/h264/include/h264.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {
@ -190,6 +187,11 @@ if (is_ios) {
"//build/config/compiler:enable_arc",
]
# TODO(hbos): Make webrtc_h264_video_toolbox compile with the standard set
# of warnings.
# See https://bugs.chromium.org/p/webrtc/issues/detail?id=6307
suppressed_configs += [ rtc_common_config ]
deps = [
"../../sdk:rtc_sdk_common_objc",
]
@ -225,7 +227,6 @@ rtc_source_set("webrtc_i420") {
"codecs/i420/include/i420.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {
@ -257,7 +258,6 @@ rtc_source_set("webrtc_vp8") {
"codecs/vp8/vp8_impl.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
# TODO(jschuh): Bug 1348: fix this warning.
@ -291,7 +291,6 @@ rtc_source_set("webrtc_vp9") {
"codecs/vp9/vp9_impl.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {
@ -325,7 +324,6 @@ if (rtc_include_tests) {
"codecs/test/videoprocessor.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {

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

@ -48,7 +48,6 @@ rtc_source_set("video_processing") {
deps += [ ":video_processing_neon" ]
}
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {
@ -65,7 +64,6 @@ if (build_video_processing_sse2) {
"util/denoiser_filter_sse2.h",
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {
@ -90,7 +88,6 @@ if (rtc_build_with_neon) {
suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
cflags = [ "-mfpu=neon" ]
}
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
}
}

2
webrtc/p2p/BUILD.gn
View File

@ -95,7 +95,6 @@ rtc_source_set("rtc_p2p") {
]
}
configs += [ "..:common_config" ]
public_configs = [
"..:common_inherited_config",
":rtc_p2p_inherited_config",
@ -170,7 +169,6 @@ if (!build_with_chromium) {
"stunprober/main.cc",
]
configs += [ "..:common_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.

6
webrtc/pc/BUILD.gn
View File

@ -63,7 +63,6 @@ rtc_source_set("rtc_pc") {
deps += [ "//third_party/libsrtp" ]
}
configs += [ "..:common_config" ]
public_configs = [
"..:common_inherited_config",
":rtc_pc_config",
@ -100,10 +99,7 @@ if (rtc_include_tests) {
include_dirs = [ "//third_party/libsrtp/srtp" ]
configs += [
"..:common_config",
":rtc_pc_unittests_config",
]
configs += [ ":rtc_pc_unittests_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {

10
webrtc/sdk/BUILD.gn
View File

@ -22,10 +22,7 @@ if (is_ios || (is_mac && mac_deployment_target == "10.7")) {
deps = [
"../base:rtc_base",
]
configs += [
"..:common_config",
"//build/config/compiler:enable_arc",
]
configs += [ "//build/config/compiler:enable_arc" ]
public_configs = [
"..:common_inherited_config",
":rtc_sdk_common_objc_config",
@ -190,6 +187,11 @@ if (is_ios || (is_mac && mac_deployment_target == "10.7")) {
"//build/config/compiler:enable_arc",
]
# TODO(tkchin): Make rtc_sdk_peerconnection_objc compile with the standard
# set of warnings.
# See https://bugs.chromium.org/p/webrtc/issues/detail?id=6308
suppressed_configs += [ rtc_common_config ]
public_configs = [ ":rtc_sdk_common_objc_config" ]
if (is_clang) {

2
webrtc/stats/BUILD.gn
View File

@ -25,7 +25,6 @@ rtc_source_set("rtc_stats") {
"rtcstatsreport.cc",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
@ -48,7 +47,6 @@ if (rtc_include_tests) {
"rtcstatsreport_unittest.cc",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {

8
webrtc/system_wrappers/BUILD.gn
View File

@ -75,8 +75,6 @@ rtc_source_set("system_wrappers") {
"source/trace_win.h",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
if (rtc_enable_data_logging) {
@ -146,7 +144,6 @@ rtc_source_set("field_trial_default") {
"source/field_trial_default.cc",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
}
@ -156,12 +153,10 @@ rtc_source_set("metrics_default") {
"source/metrics_default.cc",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
}
rtc_source_set("system_wrappers_default") {
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
deps = [
@ -177,7 +172,6 @@ if (is_android) {
"source/cpu_features_android.c",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
deps = [
"//third_party/android_tools:cpu_features",
@ -191,7 +185,6 @@ if (is_linux) {
"source/cpu_features_linux.c",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
}
}
@ -224,7 +217,6 @@ if (rtc_include_tests) {
]
}
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]

15
webrtc/test/BUILD.gn
View File

@ -74,10 +74,7 @@ rtc_source_set("channel_transport") {
"channel_transport/udp_transport_impl.h",
]
configs += [
"..:common_config",
":channel_transport_warnings_config",
]
configs += [ ":channel_transport_warnings_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang && !is_nacl) {
@ -104,7 +101,6 @@ rtc_source_set("video_test_common") {
"frame_utils.h",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang && !is_nacl) {
@ -129,7 +125,6 @@ rtc_source_set("rtp_test_utils") {
"rtp_file_writer.h",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang && !is_nacl) {
@ -158,7 +153,6 @@ rtc_source_set("field_trial") {
"../system_wrappers:field_trial_default",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
}
@ -176,7 +170,6 @@ rtc_source_set("test_main") {
"//third_party/gflags",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
}
@ -229,7 +222,6 @@ rtc_source_set("test_support") {
deps += [ "//base:base" ]
}
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
}
@ -253,7 +245,6 @@ rtc_source_set("test_support_main") {
"//third_party/gflags",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
}
@ -271,7 +262,6 @@ rtc_source_set("test_support_main_threaded_mac") {
"testsupport/mac/run_threaded_main_mac.mm",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
deps = [
@ -322,7 +312,6 @@ rtc_test("test_support_unittests") {
"testsupport/unittest_utils.h",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
# TODO(jschuh): Bug 1348: fix this warning.
@ -406,7 +395,6 @@ rtc_source_set("test_common") {
]
}
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang && !is_nacl) {
@ -489,7 +477,6 @@ rtc_source_set("test_renderer") {
]
}
configs += [ "..:common_config" ]
public_configs = [
"..:common_inherited_config",
":test_renderer_exported_config",

13
webrtc/tools/BUILD.gn
View File

@ -31,7 +31,6 @@ rtc_source_set("command_line_parser") {
deps = [
"../base:gtest_prod",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
}
@ -41,7 +40,6 @@ rtc_source_set("video_quality_analysis") {
"frame_analyzer/video_quality_analysis.h",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
deps = [
@ -57,7 +55,6 @@ rtc_executable("frame_analyzer") {
"frame_analyzer/frame_analyzer.cc",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
deps = [
@ -72,7 +69,6 @@ rtc_executable("psnr_ssim_analyzer") {
"psnr_ssim_analyzer/psnr_ssim_analyzer.cc",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
deps = [
@ -89,7 +85,6 @@ rtc_executable("rgba_to_i420_converter") {
"converter/rgba_to_i420_converter.cc",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
deps = [
@ -105,7 +100,6 @@ rtc_source_set("frame_editing_lib") {
"frame_editing/frame_editing_lib.h",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
# TODO(jschuh): Bug 1348: fix this warning.
@ -127,7 +121,6 @@ rtc_executable("frame_editor") {
"frame_editing/frame_editing.cc",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
deps = [
@ -142,7 +135,6 @@ rtc_executable("force_mic_volume_max") {
"force_mic_volume_max/force_mic_volume_max.cc",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
@ -177,7 +169,6 @@ if (rtc_enable_protobuf) {
"event_log_visualizer/plot_python.cc",
"event_log_visualizer/plot_python.h",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang && !is_nacl) {
# Suppress warnings from the Chromium Clang plugin.
@ -209,7 +200,6 @@ if (rtc_include_tests) {
"event_log_visualizer/main.cc",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang && !is_nacl) {
@ -232,7 +222,6 @@ if (rtc_include_tests) {
"agc/activity_metric.cc",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
@ -256,7 +245,6 @@ if (rtc_include_tests) {
"e2e_quality/audio/audio_e2e_harness.cc",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
@ -298,7 +286,6 @@ if (rtc_include_tests) {
"simple_command_line_parser_unittest.cc",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
# TODO(jschuh): Bug 1348: fix this warning.

2
webrtc/video/BUILD.gn
View File

@ -48,7 +48,6 @@ rtc_source_set("video") {
"vie_remb.h",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
@ -98,7 +97,6 @@ if (rtc_include_tests) {
"vie_encoder_unittest.cc",
"vie_remb_unittest.cc",
]
configs += [ "..:common_config" ]
deps = [
":video",
"//testing/gmock",

2
webrtc/voice_engine/BUILD.gn
View File

@ -78,7 +78,6 @@ rtc_source_set("voice_engine") {
]
}
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
if (is_clang) {
@ -113,7 +112,6 @@ rtc_source_set("level_indicator") {
"level_indicator.h",
]
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
deps = [