admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New build target p2p:stun_types

Browse Source 
The media:rtc_media_base target needs definitions of various
stun-related types and constant. With this new smaller target, it no
longer needs to depend on all of p2p.

Bug: webrtc:8733
Change-Id: I05910b6915f6d2c96e8f52a017adbc7eb693dca8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/150945
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29036}
This commit is contained in:
Niels Möller 2019-09-02 13:09:58 +02:00 committed by Commit Bot
parent eec5fff4df
commit 5b4fcb5bf6
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
media/BUILD.gn
View File

@ -88,6 +88,7 @@ rtc_static_library("rtc_media_base") {
"../common_video",
"../modules/audio_processing:audio_processing_statistics",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../p2p:stun_types",
"../rtc_base",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
@ -135,10 +136,6 @@ rtc_static_library("rtc_media_base") {
"base/video_source_base.cc",
"base/video_source_base.h",
]
if (!build_with_mozilla) {
deps += [ "../p2p" ]
}
}
rtc_static_library("rtc_constants") {

19
p2p/BUILD.gn
View File

@ -15,9 +15,17 @@ group("p2p") {
]
}
# TODO(bugs.webrtc.org/8733): Move base/stun.{h,cc} into this target,
# after downstream dependencies are updated.
rtc_source_set("stun_types") {
sources = [
"base/stun.cc",
"base/stun.h",
]
deps = [
"../rtc_base:checks",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
"//third_party/abseil-cpp/absl/memory",
]
}
rtc_static_library("rtc_p2p") {
@ -67,8 +75,6 @@ rtc_static_library("rtc_p2p") {
"base/regathering_controller.h",
"base/relay_port.cc",
"base/relay_port.h",
"base/stun.cc",
"base/stun.h",
"base/stun_port.cc",
"base/stun_port.h",
"base/stun_request.cc",
@ -92,6 +98,7 @@ rtc_static_library("rtc_p2p") {
]
deps = [
":stun_types",
"../api:libjingle_peerconnection_api",
"../api:scoped_refptr",
"../api/rtc_event_log",
@ -163,6 +170,7 @@ if (rtc_include_tests) {
":fake_port_allocator",
":p2p_server_utils",
":rtc_p2p",
":stun_types",
"../api:libjingle_peerconnection_api",
"../rtc_base",
"../rtc_base:gunit_helpers",
@ -208,6 +216,7 @@ if (rtc_include_tests) {
":p2p_server_utils",
":p2p_test_utils",
":rtc_p2p",
":stun_types",
"../api:libjingle_peerconnection_api",
"../api:scoped_refptr",
"../api/units:time_delta",
@ -241,6 +250,7 @@ rtc_source_set("p2p_server_utils") {
]
deps = [
":rtc_p2p",
":stun_types",
"../rtc_base",
"../rtc_base:checks",
"../rtc_base:rtc_base_tests_utils",
@ -259,6 +269,7 @@ rtc_static_library("libstunprober") {
deps = [
":rtc_p2p",
":stun_types",
"../rtc_base",
"../rtc_base:checks",
"../rtc_base/system:rtc_export",

2
test/fuzzers/BUILD.gn
View File

@ -428,6 +428,7 @@ webrtc_fuzzer_test("stun_parser_fuzzer") {
]
deps = [
"../../p2p:rtc_p2p",
"../../p2p:stun_types",
]
seed_corpus = "corpora/stun-corpus"
dict = "corpora/stun.tokens"
@ -439,6 +440,7 @@ webrtc_fuzzer_test("stun_validator_fuzzer") {
]
deps = [
"../../p2p:rtc_p2p",
"../../p2p:stun_types",
]
seed_corpus = "corpora/stun-corpus"
dict = "corpora/stun.tokens"