GN Templates: Add //build/config/sanitizers:deps to rtc_executable.
Remove //build/config/sanitizers:deps as a dependency for all rtc_executable targets and add it to the template instead. BUG=webrtc:6187 NOTRY=True Review-Url: https://codereview.webrtc.org/2308553002 Cr-Commit-Position: refs/heads/master@{#14048}
This commit is contained in:
parent
504e838be2
commit
1dd2335023
@ -292,7 +292,6 @@ if (!build_with_chromium) {
|
||||
":webrtc",
|
||||
"modules/video_capture:video_capture_internal_impl",
|
||||
"test",
|
||||
"//build/config/sanitizers:deps",
|
||||
]
|
||||
}
|
||||
|
||||
@ -314,7 +313,6 @@ if (!build_with_chromium) {
|
||||
"test:field_trial",
|
||||
"test:test_common",
|
||||
"test:test_renderer",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//testing/gmock",
|
||||
"//testing/gtest",
|
||||
"//third_party/gflags",
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
import("//build/config/arm.gni")
|
||||
import("//build/config/features.gni")
|
||||
import("//build/config/mips.gni")
|
||||
import("//build/config/sanitizers/sanitizers.gni")
|
||||
import("//build_overrides/webrtc.gni")
|
||||
import("//testing/test.gni")
|
||||
|
||||
@ -219,6 +220,7 @@ template("rtc_executable") {
|
||||
forward_variables_from(invoker,
|
||||
"*",
|
||||
[
|
||||
"deps",
|
||||
"configs",
|
||||
"suppressed_configs",
|
||||
])
|
||||
@ -226,6 +228,10 @@ template("rtc_executable") {
|
||||
configs += rtc_add_configs
|
||||
configs -= rtc_remove_configs
|
||||
configs -= invoker.suppressed_configs
|
||||
deps = [
|
||||
"//build/config/sanitizers:deps",
|
||||
]
|
||||
deps += invoker.deps
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -443,7 +443,6 @@ if (is_linux || is_win) {
|
||||
public_configs = [ ":gtk2_config" ]
|
||||
}
|
||||
deps = [
|
||||
"//build/config/sanitizers:deps",
|
||||
"//third_party/libyuv",
|
||||
"//webrtc/api:libjingle_peerconnection",
|
||||
"//webrtc/system_wrappers:field_trial_default",
|
||||
@ -465,7 +464,6 @@ if (is_linux || is_win) {
|
||||
"peerconnection/server/utils.h",
|
||||
]
|
||||
deps = [
|
||||
"//build/config/sanitizers:deps",
|
||||
"//webrtc:webrtc_common",
|
||||
"//webrtc/base:rtc_base_approved",
|
||||
"//webrtc/tools:command_line_parser",
|
||||
@ -481,7 +479,6 @@ if (is_linux || is_win) {
|
||||
"relayserver/relayserver_main.cc",
|
||||
]
|
||||
deps = [
|
||||
"//build/config/sanitizers:deps",
|
||||
"//webrtc/base:rtc_base_approved",
|
||||
"//webrtc/pc:rtc_pc",
|
||||
"//webrtc/system_wrappers:field_trial_default",
|
||||
@ -498,7 +495,6 @@ if (is_linux || is_win) {
|
||||
"turnserver/turnserver_main.cc",
|
||||
]
|
||||
deps = [
|
||||
"//build/config/sanitizers:deps",
|
||||
"//webrtc/base:rtc_base_approved",
|
||||
"//webrtc/pc:rtc_pc",
|
||||
"//webrtc/system_wrappers:field_trial_default",
|
||||
@ -515,7 +511,6 @@ if (is_linux || is_win) {
|
||||
"stunserver/stunserver_main.cc",
|
||||
]
|
||||
deps = [
|
||||
"//build/config/sanitizers:deps",
|
||||
"//webrtc/base:rtc_base_approved",
|
||||
"//webrtc/pc:rtc_pc",
|
||||
"//webrtc/system_wrappers:field_trial_default",
|
||||
|
||||
@ -944,7 +944,6 @@ if (rtc_include_tests) {
|
||||
"../../system_wrappers:system_wrappers_default",
|
||||
"../../test:test_support",
|
||||
"../rtp_rtcp",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//testing/gtest",
|
||||
"//third_party/gflags:gflags",
|
||||
]
|
||||
@ -974,7 +973,6 @@ if (rtc_include_tests) {
|
||||
"../../system_wrappers:system_wrappers_default",
|
||||
"../../test:test_support",
|
||||
"../rtp_rtcp",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//testing/gtest",
|
||||
"//third_party/gflags:gflags",
|
||||
]
|
||||
@ -1310,7 +1308,6 @@ if (rtc_include_tests) {
|
||||
":pcm16b",
|
||||
":webrtc_opus",
|
||||
"../../common_audio",
|
||||
"//build/config/sanitizers:deps",
|
||||
]
|
||||
|
||||
configs += [ ":RTPencode_config" ]
|
||||
@ -1341,7 +1338,6 @@ if (rtc_include_tests) {
|
||||
|
||||
deps = [
|
||||
":neteq_test_tools",
|
||||
"//build/config/sanitizers:deps",
|
||||
]
|
||||
}
|
||||
|
||||
@ -1355,7 +1351,6 @@ if (rtc_include_tests) {
|
||||
deps = [
|
||||
"../../system_wrappers:system_wrappers_default",
|
||||
"../../test:rtp_test_utils",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//testing/gtest",
|
||||
]
|
||||
}
|
||||
@ -1369,7 +1364,6 @@ if (rtc_include_tests) {
|
||||
|
||||
deps = [
|
||||
":neteq_test_tools",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//testing/gtest",
|
||||
]
|
||||
}
|
||||
@ -1378,7 +1372,6 @@ if (rtc_include_tests) {
|
||||
testonly = true
|
||||
deps = [
|
||||
"../..:webrtc_common",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//testing/gtest",
|
||||
]
|
||||
sources = [
|
||||
@ -1398,7 +1391,6 @@ if (rtc_include_tests) {
|
||||
":neteq_unittest_tools",
|
||||
":pcm16b",
|
||||
"../../system_wrappers:system_wrappers_default",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//testing/gtest",
|
||||
"//third_party/gflags:gflags",
|
||||
]
|
||||
@ -1423,7 +1415,6 @@ if (rtc_include_tests) {
|
||||
":neteq_unittest_tools",
|
||||
":webrtc_opus",
|
||||
"../../test:test_support_main",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//testing/gtest",
|
||||
"//third_party/gflags",
|
||||
]
|
||||
@ -1441,7 +1432,6 @@ if (rtc_include_tests) {
|
||||
":neteq_test_support",
|
||||
"../../system_wrappers:system_wrappers_default",
|
||||
"../../test:test_support",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//third_party/gflags",
|
||||
]
|
||||
}
|
||||
@ -1455,7 +1445,6 @@ if (rtc_include_tests) {
|
||||
":neteq",
|
||||
":webrtc_opus",
|
||||
"../../system_wrappers:system_wrappers_default",
|
||||
"//build/config/sanitizers:deps",
|
||||
]
|
||||
}
|
||||
|
||||
@ -1473,7 +1462,6 @@ if (rtc_include_tests) {
|
||||
":neteq_unittest_tools",
|
||||
"../../system_wrappers:system_wrappers_default",
|
||||
"../../test:test_support_main",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//testing/gtest",
|
||||
"//third_party/gflags",
|
||||
]
|
||||
@ -1491,7 +1479,6 @@ if (rtc_include_tests) {
|
||||
":neteq",
|
||||
":neteq_quality_test_support",
|
||||
"../../test:test_support_main",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//testing/gtest",
|
||||
"//third_party/gflags",
|
||||
]
|
||||
@ -1509,7 +1496,6 @@ if (rtc_include_tests) {
|
||||
":neteq",
|
||||
":neteq_quality_test_support",
|
||||
"../../test:test_support_main",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//testing/gtest",
|
||||
"//third_party/gflags",
|
||||
]
|
||||
@ -1525,7 +1511,6 @@ if (rtc_include_tests) {
|
||||
deps = [
|
||||
":isac_fix",
|
||||
"../../test:test_support",
|
||||
"//build/config/sanitizers:deps",
|
||||
]
|
||||
|
||||
if (is_win) {
|
||||
@ -1563,7 +1548,6 @@ if (rtc_include_tests) {
|
||||
deps = [
|
||||
":isac",
|
||||
"../../base:rtc_base_approved",
|
||||
"//build/config/sanitizers:deps",
|
||||
]
|
||||
|
||||
configs += [ ":isac_test_warnings_config" ]
|
||||
@ -1581,7 +1565,6 @@ if (rtc_include_tests) {
|
||||
|
||||
deps = [
|
||||
":g711",
|
||||
"//build/config/sanitizers:deps",
|
||||
]
|
||||
}
|
||||
|
||||
@ -1598,7 +1581,6 @@ if (rtc_include_tests) {
|
||||
deps = [
|
||||
":g722",
|
||||
"../..:webrtc_common",
|
||||
"//build/config/sanitizers:deps",
|
||||
]
|
||||
}
|
||||
|
||||
@ -1616,7 +1598,6 @@ if (rtc_include_tests) {
|
||||
deps = [
|
||||
":isac",
|
||||
"../../base:rtc_base_approved",
|
||||
"//build/config/sanitizers:deps",
|
||||
]
|
||||
|
||||
include_dirs = [
|
||||
@ -1639,7 +1620,6 @@ if (rtc_include_tests) {
|
||||
|
||||
deps = [
|
||||
":isac",
|
||||
"//build/config/sanitizers:deps",
|
||||
]
|
||||
|
||||
include_dirs = [
|
||||
@ -1662,7 +1642,6 @@ if (rtc_include_tests) {
|
||||
|
||||
deps = [
|
||||
":ilbc",
|
||||
"//build/config/sanitizers:deps",
|
||||
]
|
||||
}
|
||||
|
||||
@ -1679,7 +1658,6 @@ if (rtc_include_tests) {
|
||||
"../../common_audio",
|
||||
"../../test:test_support",
|
||||
"../../test:test_support_main",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//testing/gtest",
|
||||
]
|
||||
|
||||
|
||||
@ -261,7 +261,6 @@ if (rtc_include_tests && !is_ios) {
|
||||
"../../test:test_support_main",
|
||||
"../rtp_rtcp",
|
||||
"../utility",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//testing/gtest",
|
||||
]
|
||||
configs += [ "../..:common_config" ]
|
||||
|
||||
@ -334,7 +334,6 @@ if (rtc_include_tests) {
|
||||
"../../system_wrappers",
|
||||
"../../system_wrappers:system_wrappers_default",
|
||||
"../../test:test_support",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//testing/gtest",
|
||||
"//third_party/gflags:gflags",
|
||||
]
|
||||
@ -356,7 +355,6 @@ if (rtc_include_tests) {
|
||||
":audioproc_test_utils",
|
||||
"../../common_audio",
|
||||
"../../system_wrappers:system_wrappers_default",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//third_party/gflags:gflags",
|
||||
]
|
||||
} # unpack_aecdump
|
||||
@ -384,7 +382,6 @@ if (rtc_include_tests) {
|
||||
"../../system_wrappers",
|
||||
"../../system_wrappers:system_wrappers_default",
|
||||
"../../test:test_support",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//testing/gtest",
|
||||
"//third_party/gflags:gflags",
|
||||
]
|
||||
|
||||
@ -192,7 +192,6 @@ if (rtc_include_tests) {
|
||||
|
||||
deps = [
|
||||
":rtp_rtcp",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//testing/gtest",
|
||||
"//webrtc/test:test_support_main",
|
||||
]
|
||||
|
||||
@ -63,7 +63,6 @@ rtc_executable("frame_analyzer") {
|
||||
deps = [
|
||||
":command_line_parser",
|
||||
":video_quality_analysis",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//build/win:default_exe_manifest",
|
||||
]
|
||||
}
|
||||
@ -79,7 +78,6 @@ rtc_executable("psnr_ssim_analyzer") {
|
||||
deps = [
|
||||
":command_line_parser",
|
||||
":video_quality_analysis",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//build/win:default_exe_manifest",
|
||||
]
|
||||
}
|
||||
@ -97,7 +95,6 @@ rtc_executable("rgba_to_i420_converter") {
|
||||
deps = [
|
||||
":command_line_parser",
|
||||
"../common_video",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//build/win:default_exe_manifest",
|
||||
]
|
||||
}
|
||||
@ -136,7 +133,6 @@ rtc_executable("frame_editor") {
|
||||
deps = [
|
||||
":command_line_parser",
|
||||
":frame_editing_lib",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//build/win:default_exe_manifest",
|
||||
]
|
||||
}
|
||||
@ -158,7 +154,6 @@ rtc_executable("force_mic_volume_max") {
|
||||
deps = [
|
||||
"../system_wrappers:system_wrappers_default",
|
||||
"../voice_engine",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//build/win:default_exe_manifest",
|
||||
]
|
||||
}
|
||||
@ -226,7 +221,6 @@ if (rtc_include_tests) {
|
||||
defines = [ "ENABLE_RTC_EVENT_LOG" ]
|
||||
deps = [
|
||||
":event_log_visualizer_utils",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//third_party/gflags",
|
||||
]
|
||||
}
|
||||
@ -250,7 +244,6 @@ if (rtc_include_tests) {
|
||||
deps = [
|
||||
"../modules/audio_processing",
|
||||
"../system_wrappers:metrics_default",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//build/win:default_exe_manifest",
|
||||
"//testing/gtest",
|
||||
"//third_party/gflags",
|
||||
@ -276,7 +269,6 @@ if (rtc_include_tests) {
|
||||
"../system_wrappers:system_wrappers_default",
|
||||
"../test:channel_transport",
|
||||
"../voice_engine",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//build/win:default_exe_manifest",
|
||||
"//testing/gtest",
|
||||
"//third_party/gflags",
|
||||
|
||||
@ -181,7 +181,6 @@ if (rtc_include_tests) {
|
||||
|
||||
deps = [
|
||||
":voice_engine",
|
||||
"//build/config/sanitizers:deps",
|
||||
"//testing/gmock",
|
||||
"//testing/gtest",
|
||||
"//third_party/gflags",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user