Stop using public_deps in modules/rtp_rtcp.
TBR=phoglund@webrtc.org
Bug: webrtc:8603
Change-Id: I86830df23db3f33a1a26098e639596bd3b86485a
No-Try: True
Reviewed-on: https://webrtc-review.googlesource.com/29780
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Edward Lemur <ehmaldonado@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21108}diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index 2a29ceb..5a63a6f 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -53,7 +53,7 @@
"../modules/congestion_controller:congestion_controller",
"../modules/pacing:pacing",
"../modules/remote_bitrate_estimator:remote_bitrate_estimator",
- "../modules/rtp_rtcp:rtp_rtcp",
+ "../modules/rtp_rtcp",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_task_queue",
diff --git a/call/BUILD.gn b/call/BUILD.gn
index cd26a11..fbd1824 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -72,6 +72,7 @@
"../api:array_view",
"../api:optional",
"../modules/rtp_rtcp",
+ "../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:rtc_base_approved",
]
}
@@ -138,6 +139,7 @@
"../modules/congestion_controller",
"../modules/pacing",
"../modules/rtp_rtcp",
+ "../modules/rtp_rtcp:rtp_rtcp_format",
"../modules/utility",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_task_queue",
@@ -210,6 +212,7 @@
"../modules/pacing:mock_paced_sender",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:mock_rtp_rtcp",
+ "../modules/rtp_rtcp:rtp_rtcp_format",
"../modules/utility:mock_process_thread",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index 7d464a6..7b31309 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -106,7 +106,7 @@
"..:webrtc_common",
"../modules/audio_coding:audio_network_adaptor",
"../modules/remote_bitrate_estimator:remote_bitrate_estimator",
- "../modules/rtp_rtcp",
+ "../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:protobuf_utils",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_task_queue",
@@ -146,7 +146,7 @@
"..:webrtc_common",
"../modules/audio_coding:audio_network_adaptor",
"../modules/remote_bitrate_estimator:remote_bitrate_estimator",
- "../modules/rtp_rtcp:rtp_rtcp",
+ "../modules/rtp_rtcp",
"../system_wrappers",
]
@@ -156,6 +156,7 @@
}
deps = [
"../call:video_stream_api",
+ "../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:protobuf_utils",
"../rtc_base:rtc_base_approved",
]
@@ -184,7 +185,7 @@
"../call:call_interfaces",
"../modules/audio_coding:audio_network_adaptor",
"../modules/remote_bitrate_estimator:remote_bitrate_estimator",
- "../modules/rtp_rtcp",
+ "../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_utils",
"../system_wrappers:metrics_default",
@@ -206,7 +207,7 @@
":rtc_event_log_api",
":rtc_event_log_impl",
":rtc_event_log_parser",
- "../modules/rtp_rtcp:rtp_rtcp",
+ "../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:rtc_base_approved",
"../system_wrappers:field_trial_default",
"../system_wrappers:metrics_default",
@@ -229,12 +230,13 @@
":rtc_event_log_impl",
":rtc_event_log_parser",
"../call:video_stream_api",
+ "../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:rtc_base_approved",
# TODO(kwiberg): Remove this dependency.
"../api/audio_codecs:audio_codecs_api",
"../modules/audio_coding:audio_network_adaptor_config",
- "../modules/rtp_rtcp:rtp_rtcp",
+ "../modules/rtp_rtcp",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 07acdef..2a1829a 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -335,7 +335,7 @@
"../call:video_stream_api",
"../modules/audio_coding:rent_a_codec",
"../modules/audio_processing:audio_processing",
- "../modules/rtp_rtcp:rtp_rtcp",
+ "../modules/rtp_rtcp:rtp_rtcp_format",
"../modules/video_coding:video_coding_utility",
"../p2p:rtc_p2p",
]
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index 91bde7f..c579997 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -1090,6 +1090,7 @@
"../../rtc_base:rtc_base_tests_utils",
"../../test:rtp_test_utils",
"../rtp_rtcp",
+ "../rtp_rtcp:rtp_rtcp_format",
]
public_deps = [
@@ -1134,6 +1135,7 @@
"../../api/audio_codecs:audio_codecs_api",
"../../rtc_base:rtc_base_approved",
"../rtp_rtcp",
+ "../rtp_rtcp:rtp_rtcp_format",
]
public_deps = [
@@ -1175,6 +1177,7 @@
":neteq_tools_minimal",
"../../logging:rtc_event_log_parser",
"../../rtc_base:rtc_base_approved",
+ "../rtp_rtcp:rtp_rtcp_format",
]
public_deps = [
"../../logging:rtc_event_log_proto",
diff --git a/modules/congestion_controller/BUILD.gn b/modules/congestion_controller/BUILD.gn
index c53f073..d1a8653 100644
--- a/modules/congestion_controller/BUILD.gn
+++ b/modules/congestion_controller/BUILD.gn
@@ -58,7 +58,7 @@
"../bitrate_controller",
"../pacing",
"../remote_bitrate_estimator",
- "../rtp_rtcp",
+ "../rtp_rtcp:rtp_rtcp_format",
"../utility",
]
}
@@ -95,7 +95,7 @@
"../pacing:mock_paced_sender",
"../pacing:pacing",
"../remote_bitrate_estimator:remote_bitrate_estimator",
- "../rtp_rtcp:rtp_rtcp",
+ "../rtp_rtcp:rtp_rtcp_format",
"//testing/gmock",
]
if (!build_with_chromium && is_clang) {
diff --git a/modules/pacing/BUILD.gn b/modules/pacing/BUILD.gn
index 2364432..02abf63 100644
--- a/modules/pacing/BUILD.gn
+++ b/modules/pacing/BUILD.gn
@@ -41,6 +41,7 @@
"../../system_wrappers",
"../remote_bitrate_estimator",
"../rtp_rtcp",
+ "../rtp_rtcp:rtp_rtcp_format",
"../utility",
]
}
@@ -65,6 +66,7 @@
"../../test:test_support",
"../rtp_rtcp",
"../rtp_rtcp:mock_rtp_rtcp",
+ "../rtp_rtcp:rtp_rtcp_format",
"//testing/gmock",
]
diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
index 73ad176..b9bf792 100644
--- a/modules/remote_bitrate_estimator/BUILD.gn
+++ b/modules/remote_bitrate_estimator/BUILD.gn
@@ -65,7 +65,7 @@
":remote_bitrate_estimator",
"../../rtc_base:rtc_base_approved",
"../../test:rtp_test_utils",
- "../rtp_rtcp:rtp_rtcp",
+ "../rtp_rtcp",
]
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
@@ -149,6 +149,7 @@
"../congestion_controller",
"../pacing",
"../rtp_rtcp",
+ "../rtp_rtcp:rtp_rtcp_format",
"../video_coding:video_coding_utility",
"//testing/gmock",
"//testing/gtest",
@@ -205,7 +206,7 @@
"../../test:field_trial",
"../../test:test_support",
"../pacing:pacing",
- "../rtp_rtcp:rtp_rtcp",
+ "../rtp_rtcp:rtp_rtcp_format",
"//testing/gmock",
]
if (is_win) {
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 71e174e..0879ab0 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -188,6 +188,7 @@
}
deps = [
+ ":rtp_rtcp_format",
"..:module_api",
"../..:webrtc_common",
"../../api:array_view",
@@ -206,10 +207,6 @@
"../remote_bitrate_estimator",
]
- public_deps = [
- ":rtp_rtcp_format",
- ]
-
# TODO(jschuh): Bug 1348: fix this warning.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
@@ -234,6 +231,7 @@
]
deps = [
":rtp_rtcp",
+ ":rtp_rtcp_format",
"../../api:array_view",
"../../api:optional",
"../../api:transport_api",
@@ -252,6 +250,7 @@
]
deps = [
":rtp_rtcp",
+ ":rtp_rtcp_format",
"..:module_api",
"../../rtc_base:rtc_base_approved",
]
@@ -273,6 +272,7 @@
]
deps = [
":rtp_rtcp",
+ ":rtp_rtcp_format",
"..:module_api",
"../../api:optional",
"../../rtc_base:rtc_base_approved",
@@ -304,6 +304,7 @@
]
deps = [
":rtp_rtcp",
+ ":rtp_rtcp_format",
"../../rtc_base:rtc_base_approved",
"../../test:test_support",
]
@@ -385,6 +386,7 @@
":mock_rtp_rtcp",
":rtcp_transceiver",
":rtp_rtcp",
+ ":rtp_rtcp_format",
"..:module_api",
"../..:webrtc_common",
"../../api:array_view",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 3e3cedc..19b0501 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -110,7 +110,7 @@
"../../rtc_base:sequenced_task_checker",
"../../system_wrappers",
"../pacing",
- "../rtp_rtcp:rtp_rtcp",
+ "../rtp_rtcp:rtp_rtcp_format",
"../utility:utility",
]
}
@@ -169,12 +169,13 @@
"../../api:optional",
"../../api/video_codecs:video_codecs_api",
"../../common_video",
- "../../modules/rtp_rtcp:rtp_rtcp",
+ "../../modules/rtp_rtcp",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_numerics",
"../../rtc_base:rtc_task_queue",
"../../rtc_base:sequenced_task_checker",
"../../system_wrappers",
+ "../rtp_rtcp:rtp_rtcp_format",
]
}
@@ -599,7 +600,7 @@
"../../test:test_support",
"../../test:video_test_common",
"../../test:video_test_support",
- "../rtp_rtcp:rtp_rtcp",
+ "../rtp_rtcp:rtp_rtcp_format",
"//testing/gmock",
]
if (rtc_build_libvpx) {
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 9cbfa31..8ab0951 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -228,6 +228,7 @@
"../modules:module_api",
"../modules/audio_coding:ana_debug_dump_proto",
"../modules/audio_coding:neteq_tools",
+ "../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_numerics",
diff --git a/test/BUILD.gn b/test/BUILD.gn
index efb1978..8bc9541 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -93,6 +93,7 @@
"..:webrtc_common",
"../api:array_view",
"../modules/rtp_rtcp",
+ "../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:rtc_base_approved",
"//testing/gtest",
]
@@ -575,6 +576,7 @@
"../modules/audio_processing",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:mock_rtp_rtcp",
+ "../modules/rtp_rtcp:rtp_rtcp_format",
"../modules/video_coding:video_coding_utility",
"../modules/video_coding:webrtc_h264",
"../modules/video_coding:webrtc_vp8",
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index 8a1cb97..f88b47d 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -102,6 +102,7 @@
]
deps = [
"../../modules/rtp_rtcp",
+ "../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:rtc_base_approved",
]
}
@@ -112,6 +113,7 @@
]
deps = [
"../../modules/rtp_rtcp",
+ "../../modules/rtp_rtcp:rtp_rtcp_format",
"../../system_wrappers",
]
libfuzzer_options = [ "max_len=200" ]
@@ -124,6 +126,7 @@
deps = [
"../../modules/rtp_rtcp",
"../../modules/rtp_rtcp:fec_test_helper",
+ "../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:rtc_base_approved",
]
}
@@ -135,6 +138,7 @@
deps = [
"../../modules/rtp_rtcp",
"../../modules/rtp_rtcp:fec_test_helper",
+ "../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:rtc_base_approved",
]
}
@@ -145,6 +149,7 @@
]
deps = [
"../../modules/rtp_rtcp",
+ "../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:rtc_base_approved",
]
libfuzzer_options = [ "max_len=2000" ]
@@ -156,6 +161,7 @@
]
deps = [
"../../modules/rtp_rtcp",
+ "../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:rtc_base_approved",
]
libfuzzer_options = [ "max_len=2000" ]
@@ -189,7 +195,7 @@
"rtp_packet_fuzzer.cc",
]
deps = [
- "../../modules/rtp_rtcp",
+ "../../modules/rtp_rtcp:rtp_rtcp_format",
]
seed_corpus = "corpora/rtp-corpus"
}
@@ -200,6 +206,7 @@
]
deps = [
"../../modules/rtp_rtcp",
+ "../../modules/rtp_rtcp:rtp_rtcp_format",
]
}
@@ -213,7 +220,7 @@
"../../modules/congestion_controller",
"../../modules/pacing",
"../../modules/remote_bitrate_estimator:remote_bitrate_estimator",
- "../../modules/rtp_rtcp",
+ "../../modules/rtp_rtcp:rtp_rtcp_format",
]
}
@@ -226,7 +233,7 @@
"../..:webrtc_common",
"../../api:optional",
"../../api/audio_codecs:audio_codecs_api",
- "../../modules/rtp_rtcp",
+ "../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:rtc_base_approved",
]
}
@@ -310,7 +317,7 @@
"../../modules/audio_coding:neteq_test_tools",
"../../modules/audio_coding:neteq_tools_minimal",
"../../modules/audio_coding:pcm16b",
- "../../modules/rtp_rtcp",
+ "../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_base_tests_utils",
]
@@ -326,7 +333,7 @@
"../../modules/audio_coding:neteq_test_tools",
"../../modules/audio_coding:neteq_tools_minimal",
"../../modules/audio_coding:pcm16b",
- "../../modules/rtp_rtcp",
+ "../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_base_tests_utils",
]
@@ -390,7 +397,7 @@
]
deps = [
"../../api:array_view",
- "../../modules/rtp_rtcp",
+ "../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:rtc_base_approved",
"../../voice_engine",
]
diff --git a/video/BUILD.gn b/video/BUILD.gn
index 434857b..c30f42f 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -63,6 +63,7 @@
"../call:call_interfaces",
"../call:rtp_interfaces",
"../call:video_stream_api",
+ "../modules/rtp_rtcp:rtp_rtcp_format",
# For RtxReceiveStream.
"../call:rtp_receiver",
@@ -278,6 +279,7 @@
"../modules/pacing",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:mock_rtp_rtcp",
+ "../modules/rtp_rtcp:rtp_rtcp_format",
"../modules/utility",
"../modules/video_coding",
"../modules/video_coding:video_coding_utility",
diff --git a/voice_engine/BUILD.gn b/voice_engine/BUILD.gn
index 07a4f48..292e8c4 100644
--- a/voice_engine/BUILD.gn
+++ b/voice_engine/BUILD.gn
@@ -71,6 +71,7 @@
"../modules/media_file",
"../modules/pacing",
"../modules/rtp_rtcp",
+ "../modules/rtp_rtcp:rtp_rtcp_format",
"../modules/utility",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_task_queue",
@@ -103,7 +104,7 @@
"../modules/audio_device",
"../modules/audio_processing",
"../modules/media_file",
- "../modules/rtp_rtcp",
+ "../modules/rtp_rtcp:rtp_rtcp_format",
"../modules/utility",
"../modules/video_capture:video_capture",
"../rtc_base:rtc_base_approved",