From 39a41d92dd22b8dc39f2fe3f7165e6d3e28be62e Mon Sep 17 00:00:00 2001 From: perkj Date: Mon, 12 Jun 2017 05:53:35 -0700 Subject: [PATCH] Split rtc_task_queue target. Add separate target for sequenced_task_checker and weak_ptr. This is to make it possible to override the rtc_task_queue target only. BUG=none Review-Url: https://codereview.webrtc.org/2931273002 Cr-Commit-Position: refs/heads/master@{#18534} --- webrtc/BUILD.gn | 2 + webrtc/base/BUILD.gn | 80 +++++++++++++++++++++++----- webrtc/modules/rtp_rtcp/BUILD.gn | 2 +- webrtc/modules/video_coding/BUILD.gn | 4 +- webrtc/sdk/android/BUILD.gn | 2 + webrtc/test/BUILD.gn | 1 + webrtc/tools/network_tester/BUILD.gn | 1 + webrtc/video/BUILD.gn | 2 + 8 files changed, 80 insertions(+), 14 deletions(-) diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index 991a7a3d0d..766d3d4636 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -407,6 +407,8 @@ if (rtc_include_tests) { "base:rtc_base_unittests", "base:rtc_numerics_unittests", "base:rtc_task_queue_unittests", + "base:sequenced_task_checker_unittests", + "base:weak_ptr_unittests", "p2p:libstunprober_unittests", "p2p:rtc_p2p_unittests", "system_wrappers:metrics_default", diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn index 83cb750dd2..2433371775 100644 --- a/webrtc/base/BUILD.gn +++ b/webrtc/base/BUILD.gn @@ -23,6 +23,8 @@ group("base") { ":rtc_base", ":rtc_base_approved", ":rtc_task_queue", + ":sequenced_task_checker", + ":weak_ptr", ] if (is_android) { public_deps += [ ":base_java" ] @@ -295,21 +297,13 @@ rtc_static_library("rtc_task_queue") { ":rtc_base_approved", ] - sources = [ - "sequenced_task_checker.h", - "sequenced_task_checker_impl.cc", - "sequenced_task_checker_impl.h", - "weak_ptr.cc", - "weak_ptr.h", - ] - if (build_with_chromium) { - sources += [ + sources = [ "../../webrtc_overrides/webrtc/base/task_queue.cc", "../../webrtc_overrides/webrtc/base/task_queue.h", ] } else { - sources += [ + sources = [ "task_queue.h", "task_queue_posix.h", ] @@ -339,6 +333,28 @@ rtc_static_library("rtc_task_queue") { } } +rtc_static_library("sequenced_task_checker") { + sources = [ + "sequenced_task_checker.h", + "sequenced_task_checker_impl.cc", + "sequenced_task_checker_impl.h", + ] + deps = [ + ":rtc_task_queue", + ] +} + +rtc_static_library("weak_ptr") { + sources = [ + "weak_ptr.cc", + "weak_ptr.h", + ] + deps = [ + ":rtc_base_approved", + ":sequenced_task_checker", + ] +} + rtc_static_library("rtc_numerics") { sources = [ "numerics/exp_filter.cc", @@ -853,9 +869,7 @@ if (rtc_include_tests) { visibility = [ "//webrtc:rtc_unittests" ] } sources = [ - "sequenced_task_checker_unittest.cc", "task_queue_unittest.cc", - "weak_ptr_unittest.cc", ] deps = [ ":rtc_base_tests_main", @@ -869,6 +883,48 @@ if (rtc_include_tests) { } } + rtc_source_set("sequenced_task_checker_unittests") { + testonly = true + + # Skip restricting visibility on mobile platforms since the tests on those + # gets additional generated targets which would require many lines here to + # cover (which would be confusing to read and hard to maintain). + if (!is_android && !is_ios) { + visibility = [ "//webrtc:rtc_unittests" ] + } + sources = [ + "sequenced_task_checker_unittest.cc", + ] + deps = [ + ":rtc_base_approved", + ":rtc_base_tests_main", + ":rtc_task_queue", + ":sequenced_task_checker", + "../test:test_support", + ] + } + + rtc_source_set("weak_ptr_unittests") { + testonly = true + + # Skip restricting visibility on mobile platforms since the tests on those + # gets additional generated targets which would require many lines here to + # cover (which would be confusing to read and hard to maintain). + if (!is_android && !is_ios) { + visibility = [ "//webrtc:rtc_unittests" ] + } + sources = [ + "weak_ptr_unittest.cc", + ] + deps = [ + ":rtc_base_tests_main", + ":rtc_base_tests_utils", + ":rtc_task_queue", + ":weak_ptr", + "../test:test_support", + ] + } + rtc_source_set("rtc_numerics_unittests") { testonly = true diff --git a/webrtc/modules/rtp_rtcp/BUILD.gn b/webrtc/modules/rtp_rtcp/BUILD.gn index 1048c23914..22b614c5f8 100644 --- a/webrtc/modules/rtp_rtcp/BUILD.gn +++ b/webrtc/modules/rtp_rtcp/BUILD.gn @@ -173,7 +173,7 @@ rtc_static_library("rtp_rtcp") { "../../api/audio_codecs:audio_codecs_api", "../../base:gtest_prod", "../../base:rtc_base_approved", - "../../base:rtc_task_queue", + "../../base:sequenced_task_checker", "../../common_video", "../../logging:rtc_event_log_api", "../../system_wrappers", diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn index 4c283a86ed..2148f8ac62 100644 --- a/webrtc/modules/video_coding/BUILD.gn +++ b/webrtc/modules/video_coding/BUILD.gn @@ -101,6 +101,7 @@ rtc_static_library("video_coding") { "../../base:rtc_base_approved", "../../base:rtc_numerics", "../../base:rtc_task_queue", + "../../base:sequenced_task_checker", "../../common_video", "../../system_wrappers", "../rtp_rtcp:rtp_rtcp", @@ -138,6 +139,7 @@ rtc_static_library("video_coding_utility") { "../../base:rtc_base_approved", "../../base:rtc_numerics", "../../base:rtc_task_queue", + "../../base:sequenced_task_checker", "../../common_video", "../../modules/rtp_rtcp:rtp_rtcp", "../../system_wrappers", @@ -233,7 +235,7 @@ rtc_static_library("webrtc_vp8") { "../..:webrtc_common", "../../api/video_codecs:video_codecs_api", "../../base:rtc_base_approved", - "../../base:rtc_task_queue", + "../../base:sequenced_task_checker", "../../common_video", "../../system_wrappers", ] diff --git a/webrtc/sdk/android/BUILD.gn b/webrtc/sdk/android/BUILD.gn index cd9de1747f..299ada0a9f 100644 --- a/webrtc/sdk/android/BUILD.gn +++ b/webrtc/sdk/android/BUILD.gn @@ -75,6 +75,8 @@ rtc_static_library("libjingle_peerconnection_jni") { "../../base:rtc_base", "../../base:rtc_base_approved", "../../base:rtc_task_queue", + "../../base:sequenced_task_checker", + "../../base:weak_ptr", "../../common_video:common_video", "../../media:rtc_media", "../../media:rtc_media_base", diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn index 7426a6839f..1c637c571a 100644 --- a/webrtc/test/BUILD.gn +++ b/webrtc/test/BUILD.gn @@ -480,6 +480,7 @@ rtc_source_set("test_common") { "../audio", "../base:rtc_base_approved", "../base:rtc_task_queue", + "../base:sequenced_task_checker", "../call", "../common_video", "../logging:rtc_event_log_api", diff --git a/webrtc/tools/network_tester/BUILD.gn b/webrtc/tools/network_tester/BUILD.gn index 5fd3ac9b7f..dc2ce71fdc 100644 --- a/webrtc/tools/network_tester/BUILD.gn +++ b/webrtc/tools/network_tester/BUILD.gn @@ -43,6 +43,7 @@ if (rtc_enable_protobuf) { ":network_tester_packet_proto", "../../base:protobuf_utils", "../../base:rtc_task_queue", + "../../base:sequenced_task_checker", "../../p2p", ] diff --git a/webrtc/video/BUILD.gn b/webrtc/video/BUILD.gn index cfbadf5bff..ac8af114d2 100644 --- a/webrtc/video/BUILD.gn +++ b/webrtc/video/BUILD.gn @@ -61,6 +61,8 @@ rtc_static_library("video") { "../base:rtc_base_approved", "../base:rtc_numerics", "../base:rtc_task_queue", + "../base:sequenced_task_checker", + "../base:weak_ptr", "../call:call_interfaces", "../call:rtp_interfaces", "../common_video",