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}
This commit is contained in:
Mirko Bonadei
2017-12-06 07:51:33 +01:00
committed by Commit Bot
parent 51df88c674
commit b5728d9b0f
15 changed files with 52 additions and 25 deletions

View File

@ -53,7 +53,7 @@ rtc_static_library("audio") {
"../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",

View File

@ -72,6 +72,7 @@ rtc_source_set("rtp_receiver") {
"../api:array_view",
"../api:optional",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:rtc_base_approved",
]
}
@ -138,6 +139,7 @@ rtc_static_library("call") {
"../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 @@ if (rtc_include_tests) {
"../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",

View File

@ -106,7 +106,7 @@ rtc_static_library("rtc_event_log_impl") {
"..: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 @@ if (rtc_enable_protobuf) {
"..: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 @@ if (rtc_enable_protobuf) {
}
deps = [
"../call:video_stream_api",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:protobuf_utils",
"../rtc_base:rtc_base_approved",
]
@ -184,7 +185,7 @@ if (rtc_enable_protobuf) {
"../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 @@ if (rtc_enable_protobuf) {
":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 @@ if (rtc_enable_protobuf) {
":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).

View File

@ -335,7 +335,7 @@ if (rtc_include_tests) {
"../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",
]

View File

@ -1090,6 +1090,7 @@ rtc_source_set("neteq_test_tools") {
"../../rtc_base:rtc_base_tests_utils",
"../../test:rtp_test_utils",
"../rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",
]
public_deps = [
@ -1134,6 +1135,7 @@ rtc_source_set("neteq_tools") {
"../../api/audio_codecs:audio_codecs_api",
"../../rtc_base:rtc_base_approved",
"../rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",
]
public_deps = [
@ -1175,6 +1177,7 @@ if (rtc_enable_protobuf) {
":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",

View File

@ -58,7 +58,7 @@ rtc_static_library("congestion_controller") {
"../bitrate_controller",
"../pacing",
"../remote_bitrate_estimator",
"../rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",
"../utility",
]
}
@ -95,7 +95,7 @@ if (rtc_include_tests) {
"../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) {

View File

@ -41,6 +41,7 @@ rtc_static_library("pacing") {
"../../system_wrappers",
"../remote_bitrate_estimator",
"../rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",
"../utility",
]
}
@ -65,6 +66,7 @@ if (rtc_include_tests) {
"../../test:test_support",
"../rtp_rtcp",
"../rtp_rtcp:mock_rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",
"//testing/gmock",
]

View File

@ -65,7 +65,7 @@ if (!build_with_chromium) {
":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 @@ if (rtc_include_tests) {
"../congestion_controller",
"../pacing",
"../rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",
"../video_coding:video_coding_utility",
"//testing/gmock",
"//testing/gtest",
@ -205,7 +206,7 @@ if (rtc_include_tests) {
"../../test:field_trial",
"../../test:test_support",
"../pacing:pacing",
"../rtp_rtcp:rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",
"//testing/gmock",
]
if (is_win) {

View File

@ -188,6 +188,7 @@ rtc_static_library("rtp_rtcp") {
}
deps = [
":rtp_rtcp_format",
"..:module_api",
"../..:webrtc_common",
"../../api:array_view",
@ -206,10 +207,6 @@ rtc_static_library("rtp_rtcp") {
"../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 @@ rtc_source_set("rtcp_transceiver") {
]
deps = [
":rtp_rtcp",
":rtp_rtcp_format",
"../../api:array_view",
"../../api:optional",
"../../api:transport_api",
@ -252,6 +250,7 @@ rtc_source_set("fec_test_helper") {
]
deps = [
":rtp_rtcp",
":rtp_rtcp_format",
"..:module_api",
"../../rtc_base:rtc_base_approved",
]
@ -273,6 +272,7 @@ rtc_source_set("mock_rtp_rtcp") {
]
deps = [
":rtp_rtcp",
":rtp_rtcp_format",
"..:module_api",
"../../api:optional",
"../../rtc_base:rtc_base_approved",
@ -304,6 +304,7 @@ if (rtc_include_tests) {
]
deps = [
":rtp_rtcp",
":rtp_rtcp_format",
"../../rtc_base:rtc_base_approved",
"../../test:test_support",
]
@ -385,6 +386,7 @@ if (rtc_include_tests) {
":mock_rtp_rtcp",
":rtcp_transceiver",
":rtp_rtcp",
":rtp_rtcp_format",
"..:module_api",
"../..:webrtc_common",
"../../api:array_view",

View File

@ -110,7 +110,7 @@ rtc_static_library("video_coding") {
"../../rtc_base:sequenced_task_checker",
"../../system_wrappers",
"../pacing",
"../rtp_rtcp:rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",
"../utility:utility",
]
}
@ -169,12 +169,13 @@ rtc_source_set("video_coding_utility") {
"../../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 @@ if (rtc_include_tests) {
"../../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) {

View File

@ -228,6 +228,7 @@ if (!build_with_chromium) {
"../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",

View File

@ -93,6 +93,7 @@ rtc_source_set("rtp_test_utils") {
"..: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 @@ rtc_source_set("test_common") {
"../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",

View File

@ -102,6 +102,7 @@ webrtc_fuzzer_test("flexfec_header_reader_fuzzer") {
]
deps = [
"../../modules/rtp_rtcp",
"../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:rtc_base_approved",
]
}
@ -112,6 +113,7 @@ webrtc_fuzzer_test("flexfec_sender_fuzzer") {
]
deps = [
"../../modules/rtp_rtcp",
"../../modules/rtp_rtcp:rtp_rtcp_format",
"../../system_wrappers",
]
libfuzzer_options = [ "max_len=200" ]
@ -124,6 +126,7 @@ webrtc_fuzzer_test("ulpfec_header_reader_fuzzer") {
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 @@ webrtc_fuzzer_test("ulpfec_generator_fuzzer") {
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 @@ webrtc_fuzzer_test("ulpfec_receiver_fuzzer") {
]
deps = [
"../../modules/rtp_rtcp",
"../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:rtc_base_approved",
]
libfuzzer_options = [ "max_len=2000" ]
@ -156,6 +161,7 @@ webrtc_fuzzer_test("flexfec_receiver_fuzzer") {
]
deps = [
"../../modules/rtp_rtcp",
"../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:rtc_base_approved",
]
libfuzzer_options = [ "max_len=2000" ]
@ -189,7 +195,7 @@ webrtc_fuzzer_test("rtp_packet_fuzzer") {
"rtp_packet_fuzzer.cc",
]
deps = [
"../../modules/rtp_rtcp",
"../../modules/rtp_rtcp:rtp_rtcp_format",
]
seed_corpus = "corpora/rtp-corpus"
}
@ -200,6 +206,7 @@ webrtc_fuzzer_test("rtp_header_fuzzer") {
]
deps = [
"../../modules/rtp_rtcp",
"../../modules/rtp_rtcp:rtp_rtcp_format",
]
}
@ -213,7 +220,7 @@ webrtc_fuzzer_test("congestion_controller_feedback_fuzzer") {
"../../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 @@ rtc_static_library("audio_decoder_fuzzer") {
"../..: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 @@ webrtc_fuzzer_test("neteq_rtp_fuzzer") {
"../../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 @@ webrtc_fuzzer_test("neteq_signal_fuzzer") {
"../../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 @@ webrtc_fuzzer_test("transport_feedback_packet_loss_tracker_fuzzer") {
]
deps = [
"../../api:array_view",
"../../modules/rtp_rtcp",
"../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:rtc_base_approved",
"../../voice_engine",
]

View File

@ -63,6 +63,7 @@ rtc_static_library("video") {
"../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 @@ if (rtc_include_tests) {
"../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",

View File

@ -71,6 +71,7 @@ rtc_static_library("voice_engine") {
"../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 @@ if (rtc_include_tests) {
"../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",