From b7854e43af7aa3231f6e442747cb6d079eba8f94 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Mon, 3 May 2021 14:39:25 +0200 Subject: Enable GN check on //net. This should avoid the situation where WebRTC's GN check is green and Chromium (which turns it ON for //third_party/webrtc) fails. Bug: webrtc:12614 Change-Id: Id4c06ac57e9faa07c5e43491a61fbc093c68a40d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/217221 Commit-Queue: Mirko Bonadei Reviewed-by: Florent Castelli Reviewed-by: Victor Boivie Cr-Commit-Position: refs/heads/master@{#33900} --- net/dcsctp/packet/BUILD.gn | 28 +++++++++++++++++++++++---- net/dcsctp/public/BUILD.gn | 5 ++++- net/dcsctp/rx/BUILD.gn | 17 +++++++++++++++-- net/dcsctp/socket/BUILD.gn | 46 +++++++++++++++++++++++++++++++++++++++++++-- net/dcsctp/testing/BUILD.gn | 7 +++++++ net/dcsctp/timer/BUILD.gn | 2 ++ net/dcsctp/tx/BUILD.gn | 17 ++++++++++++++++- 7 files changed, 112 insertions(+), 10 deletions(-) (limited to 'net') diff --git a/net/dcsctp/packet/BUILD.gn b/net/dcsctp/packet/BUILD.gn index b690822ef1..9c08ebc80e 100644 --- a/net/dcsctp/packet/BUILD.gn +++ b/net/dcsctp/packet/BUILD.gn @@ -33,7 +33,10 @@ rtc_library("tlv_trait") { "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", ] - absl_deps = [ "//third_party/abseil-cpp/absl/strings:strings" ] + absl_deps = [ + "//third_party/abseil-cpp/absl/strings:strings", + "//third_party/abseil-cpp/absl/types:optional", + ] sources = [ "tlv_trait.cc", "tlv_trait.h", @@ -103,7 +106,11 @@ rtc_library("parameter") { "parameter/supported_extensions_parameter.cc", "parameter/supported_extensions_parameter.h", ] - absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] + absl_deps = [ + "//third_party/abseil-cpp/absl/algorithm:container", + "//third_party/abseil-cpp/absl/strings", + "//third_party/abseil-cpp/absl/types:optional", + ] } rtc_library("error_cause") { @@ -151,7 +158,11 @@ rtc_library("error_cause") { "error_cause/user_initiated_abort_cause.cc", "error_cause/user_initiated_abort_cause.h", ] - absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] + absl_deps = [ + "//third_party/abseil-cpp/absl/algorithm:container", + "//third_party/abseil-cpp/absl/strings", + "//third_party/abseil-cpp/absl/types:optional", + ] } rtc_library("chunk") { @@ -208,7 +219,11 @@ rtc_library("chunk") { "chunk/shutdown_complete_chunk.cc", "chunk/shutdown_complete_chunk.h", ] - absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] + absl_deps = [ + "//third_party/abseil-cpp/absl/algorithm:container", + "//third_party/abseil-cpp/absl/strings", + "//third_party/abseil-cpp/absl/types:optional", + ] } rtc_library("chunk_validators") { @@ -265,6 +280,10 @@ if (rtc_include_tests) { "../../../rtc_base:gunit_helpers", "../../../rtc_base:rtc_base_approved", "../../../test:test_support", + "../common:internal_types", + "../common:math", + "../public:types", + "../testing:testing_macros", ] sources = [ "bounded_byte_reader_test.cc", @@ -314,5 +333,6 @@ if (rtc_include_tests) { "sctp_packet_test.cc", "tlv_trait_test.cc", ] + absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } } diff --git a/net/dcsctp/public/BUILD.gn b/net/dcsctp/public/BUILD.gn index dc23df673a..85cf529c2f 100644 --- a/net/dcsctp/public/BUILD.gn +++ b/net/dcsctp/public/BUILD.gn @@ -37,7 +37,10 @@ rtc_source_set("socket") { "packet_observer.h", "timeout.h", ] - absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] + absl_deps = [ + "//third_party/abseil-cpp/absl/strings", + "//third_party/abseil-cpp/absl/types:optional", + ] } if (rtc_include_tests) { diff --git a/net/dcsctp/rx/BUILD.gn b/net/dcsctp/rx/BUILD.gn index 55d3aa64dd..7b5406b753 100644 --- a/net/dcsctp/rx/BUILD.gn +++ b/net/dcsctp/rx/BUILD.gn @@ -23,7 +23,10 @@ rtc_library("data_tracker") { "data_tracker.cc", "data_tracker.h", ] - absl_deps = [ "//third_party/abseil-cpp/absl/strings" ] + absl_deps = [ + "//third_party/abseil-cpp/absl/strings", + "//third_party/abseil-cpp/absl/types:optional", + ] } rtc_source_set("reassembly_streams") { @@ -81,7 +84,10 @@ rtc_library("reassembly_queue") { "reassembly_queue.cc", "reassembly_queue.h", ] - absl_deps = [ "//third_party/abseil-cpp/absl/strings" ] + absl_deps = [ + "//third_party/abseil-cpp/absl/strings", + "//third_party/abseil-cpp/absl/types:optional", + ] } if (rtc_include_tests) { @@ -91,14 +97,21 @@ if (rtc_include_tests) { deps = [ ":data_tracker", ":reassembly_queue", + ":reassembly_streams", ":traditional_reassembly_streams", "../../../api:array_view", "../../../rtc_base:checks", "../../../rtc_base:gunit_helpers", "../../../rtc_base:rtc_base_approved", "../../../test:test_support", + "../common:sequence_numbers", + "../packet:chunk", + "../packet:data", + "../public:types", "../testing:data_generator", + "../timer", ] + absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] sources = [ "data_tracker_test.cc", "reassembly_queue_test.cc", diff --git a/net/dcsctp/socket/BUILD.gn b/net/dcsctp/socket/BUILD.gn index 73d3ef2760..2fb05abdc9 100644 --- a/net/dcsctp/socket/BUILD.gn +++ b/net/dcsctp/socket/BUILD.gn @@ -68,7 +68,10 @@ rtc_library("stream_reset_handler") { "stream_reset_handler.cc", "stream_reset_handler.h", ] - absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] + absl_deps = [ + "//third_party/abseil-cpp/absl/strings", + "//third_party/abseil-cpp/absl/types:optional", + ] } rtc_library("transmission_control_block") { @@ -153,7 +156,19 @@ if (rtc_include_tests) { rtc_source_set("mock_callbacks") { testonly = true sources = [ "mock_dcsctp_socket_callbacks.h" ] - deps = [ "../public:socket" ] + deps = [ + "../../../api:array_view", + "../../../rtc_base:logging", + "../../../rtc_base:rtc_base_approved", + "../../../test:test_support", + "../public:socket", + "../public:types", + "../timer", + ] + absl_deps = [ + "//third_party/abseil-cpp/absl/strings", + "//third_party/abseil-cpp/absl/types:optional", + ] } rtc_source_set("mock_context") { @@ -162,11 +177,16 @@ if (rtc_include_tests) { deps = [ ":context", ":mock_callbacks", + "../../../test:test_support", "../common:internal_types", "../packet:sctp_packet", "../public:socket", "../public:types", ] + absl_deps = [ + "//third_party/abseil-cpp/absl/strings", + "//third_party/abseil-cpp/absl/types:optional", + ] } rtc_library("dcsctp_socket_unittests") { @@ -175,12 +195,34 @@ if (rtc_include_tests) { deps = [ ":dcsctp_socket", ":heartbeat_handler", + ":mock_callbacks", + ":mock_context", ":stream_reset_handler", "../../../api:array_view", "../../../rtc_base:checks", "../../../rtc_base:gunit_helpers", "../../../rtc_base:rtc_base_approved", "../../../test:test_support", + "../common:internal_types", + "../packet:chunk", + "../packet:error_cause", + "../packet:parameter", + "../packet:sctp_packet", + "../packet:tlv_trait", + "../public:socket", + "../public:types", + "../rx:data_tracker", + "../rx:reassembly_queue", + "../testing:data_generator", + "../testing:testing_macros", + "../timer", + "../tx:mock_send_queue", + "../tx:retransmission_queue", + ] + absl_deps = [ + "//third_party/abseil-cpp/absl/memory", + "//third_party/abseil-cpp/absl/strings", + "//third_party/abseil-cpp/absl/types:optional", ] sources = [ "dcsctp_socket_test.cc", diff --git a/net/dcsctp/testing/BUILD.gn b/net/dcsctp/testing/BUILD.gn index fa20500704..5367ef8c6f 100644 --- a/net/dcsctp/testing/BUILD.gn +++ b/net/dcsctp/testing/BUILD.gn @@ -20,9 +20,16 @@ rtc_library("data_generator") { "../../../rtc_base", "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", + "../common:internal_types", + "../packet:data", + "../public:types", ] sources = [ "data_generator.cc", "data_generator.h", ] + absl_deps = [ + "//third_party/abseil-cpp/absl/strings", + "//third_party/abseil-cpp/absl/types:optional", + ] } diff --git a/net/dcsctp/timer/BUILD.gn b/net/dcsctp/timer/BUILD.gn index 6354de01fb..e95ab676cd 100644 --- a/net/dcsctp/timer/BUILD.gn +++ b/net/dcsctp/timer/BUILD.gn @@ -41,7 +41,9 @@ if (rtc_include_tests) { "../../../rtc_base:gunit_helpers", "../../../rtc_base:rtc_base_approved", "../../../test:test_support", + "../public:socket", ] sources = [ "timer_test.cc" ] + absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } } diff --git a/net/dcsctp/tx/BUILD.gn b/net/dcsctp/tx/BUILD.gn index db11d29399..924a194f85 100644 --- a/net/dcsctp/tx/BUILD.gn +++ b/net/dcsctp/tx/BUILD.gn @@ -89,6 +89,7 @@ rtc_library("retransmission_queue") { "retransmission_queue.h", ] absl_deps = [ + "//third_party/abseil-cpp/absl/algorithm:container", "//third_party/abseil-cpp/absl/strings", "//third_party/abseil-cpp/absl/types:optional", ] @@ -97,7 +98,12 @@ rtc_library("retransmission_queue") { if (rtc_include_tests) { rtc_source_set("mock_send_queue") { testonly = true - deps = [ ":send_queue" ] + deps = [ + ":send_queue", + "../../../api:array_view", + "../../../test:test_support", + ] + absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] sources = [ "mock_send_queue.h" ] } @@ -106,15 +112,24 @@ if (rtc_include_tests) { deps = [ ":fcfs_send_queue", + ":mock_send_queue", ":retransmission_error_counter", ":retransmission_queue", ":retransmission_timeout", + ":send_queue", "../../../api:array_view", "../../../rtc_base:checks", "../../../rtc_base:gunit_helpers", "../../../rtc_base:rtc_base_approved", "../../../test:test_support", + "../packet:chunk", + "../packet:data", + "../public:socket", + "../public:types", + "../testing:data_generator", + "../timer", ] + absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] sources = [ "fcfs_send_queue_test.cc", "retransmission_error_counter_test.cc", -- cgit v1.2.3