From b24e72090701e8e6ec03935bec1b48b52aa3ef8b Mon Sep 17 00:00:00 2001 From: Andrey Logvin Date: Thu, 14 Jan 2021 08:29:36 +0000 Subject: [PATCH] Fix inconsistencies in network BUILD.gn file Bug: webrtc:12344 Change-Id: I885d5a8aa598d6986a8551eb97debb76c20da34f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/201720 Reviewed-by: Artem Titov Reviewed-by: Mirko Bonadei Commit-Queue: Andrey Logvin Cr-Commit-Position: refs/heads/master@{#32970} --- test/network/BUILD.gn | 118 ++++++++++++++++++++++-------------------- 1 file changed, 61 insertions(+), 57 deletions(-) diff --git a/test/network/BUILD.gn b/test/network/BUILD.gn index 543fa99f84..9c5c2be2bc 100644 --- a/test/network/BUILD.gn +++ b/test/network/BUILD.gn @@ -92,31 +92,33 @@ rtc_library("network_emulation_unittest") { ] } -rtc_library("network_emulation_pc_unittest") { - testonly = true - sources = [ "network_emulation_pc_unittest.cc" ] - deps = [ - ":emulated_network", - "../:test_support", - "../../api:callfactory_api", - "../../api:libjingle_peerconnection_api", - "../../api:scoped_refptr", - "../../api:simulated_network_api", - "../../api/rtc_event_log:rtc_event_log_factory", - "../../api/task_queue:default_task_queue_factory", - "../../api/transport:field_trial_based_config", - "../../call:simulated_network", - "../../media:rtc_audio_video", - "../../media:rtc_media_engine_defaults", - "../../modules/audio_device:audio_device_impl", - "../../p2p:rtc_p2p", - "../../pc:pc_test_utils", - "../../pc:peerconnection_wrapper", - "../../rtc_base", - "../../rtc_base:gunit_helpers", - "../../rtc_base:logging", - "../../rtc_base:rtc_event", - ] +if (rtc_include_tests) { + rtc_library("network_emulation_pc_unittest") { + testonly = true + sources = [ "network_emulation_pc_unittest.cc" ] + deps = [ + ":emulated_network", + "../:test_support", + "../../api:callfactory_api", + "../../api:libjingle_peerconnection_api", + "../../api:scoped_refptr", + "../../api:simulated_network_api", + "../../api/rtc_event_log:rtc_event_log_factory", + "../../api/task_queue:default_task_queue_factory", + "../../api/transport:field_trial_based_config", + "../../call:simulated_network", + "../../media:rtc_audio_video", + "../../media:rtc_media_engine_defaults", + "../../modules/audio_device:audio_device_impl", + "../../p2p:rtc_p2p", + "../../pc:pc_test_utils", + "../../pc:peerconnection_wrapper", + "../../rtc_base", + "../../rtc_base:gunit_helpers", + "../../rtc_base:logging", + "../../rtc_base:rtc_event", + ] + } } rtc_library("cross_traffic_unittest") { @@ -132,42 +134,44 @@ rtc_library("cross_traffic_unittest") { "../../rtc_base:logging", "../../rtc_base:network_constants", "../../rtc_base:rtc_event", - "//test/time_controller:time_controller", - ] - absl_deps = [ "//third_party/abseil-cpp/absl/memory" ] -} - -rtc_library("feedback_generator") { - testonly = true - sources = [ - "feedback_generator.cc", - "feedback_generator.h", - ] - deps = [ - ":emulated_network", - "../../api/transport:test_feedback_generator_interface", - "../../call:simulated_network", - "../../rtc_base:checks", "../time_controller", ] absl_deps = [ "//third_party/abseil-cpp/absl/memory" ] } -rtc_library("feedback_generator_unittest") { - testonly = true - sources = [ "feedback_generator_unittest.cc" ] - deps = [ - "../:test_support", - "../../api/transport:test_feedback_generator", - ] -} +if (rtc_include_tests) { + rtc_library("feedback_generator") { + testonly = true + sources = [ + "feedback_generator.cc", + "feedback_generator.h", + ] + deps = [ + ":emulated_network", + "../../api/transport:test_feedback_generator_interface", + "../../call:simulated_network", + "../../rtc_base:checks", + "../time_controller", + ] + absl_deps = [ "//third_party/abseil-cpp/absl/memory" ] + } -rtc_library("network_emulation_unittests") { - testonly = true - deps = [ - ":cross_traffic_unittest", - ":feedback_generator_unittest", - ":network_emulation_pc_unittest", - ":network_emulation_unittest", - ] + rtc_library("feedback_generator_unittest") { + testonly = true + sources = [ "feedback_generator_unittest.cc" ] + deps = [ + "../:test_support", + "../../api/transport:test_feedback_generator", + ] + } + + rtc_library("network_emulation_unittests") { + testonly = true + deps = [ + ":cross_traffic_unittest", + ":feedback_generator_unittest", + ":network_emulation_pc_unittest", + ":network_emulation_unittest", + ] + } }