mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move relay server code to a test-only target p2p_server_utils.

Browse source 
Bug: webrtc:9798
Change-Id: I5926cbb11922c7bd1adfa2099431dc461cc63f20
Reviewed-on: https://webrtc-review.googlesource.com/c/107361
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25347}
This commit is contained in:
Niels Möller 2018-10-24 15:54:52 +02:00 committed by Commit Bot
parent 01c68b8001
commit e284c521f7
2 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
examples/BUILD.gn
View file

@ -731,6 +731,7 @@ if (is_linux || is_win) {
"relayserver/relayserver_main.cc", "relayserver/relayserver_main.cc",
] ]
deps = [ deps = [
"../p2p:p2p_server_utils",
"../p2p:rtc_p2p", "../p2p:rtc_p2p",
"../pc:rtc_pc", "../pc:rtc_pc",
"../rtc_base:rtc_base", "../rtc_base:rtc_base",
@ -747,6 +748,7 @@ if (is_linux || is_win) {
"turnserver/turnserver_main.cc", "turnserver/turnserver_main.cc",
] ]
deps = [ deps = [
"../p2p:p2p_server_utils",
"../p2p:rtc_p2p", "../p2p:rtc_p2p",
"../pc:rtc_pc", "../pc:rtc_pc",
"../rtc_base:rtc_base", "../rtc_base:rtc_base",
@ -763,6 +765,7 @@ if (is_linux || is_win) {
"stunserver/stunserver_main.cc", "stunserver/stunserver_main.cc",
] ]
deps = [ deps = [
"../p2p:p2p_server_utils",
"../p2p:rtc_p2p", "../p2p:rtc_p2p",
"../pc:rtc_pc", "../pc:rtc_pc",
"../rtc_base:rtc_base", "../rtc_base:rtc_base",

30
p2p/BUILD.gn
View file

@ -109,15 +109,6 @@ rtc_static_library("rtc_p2p") {
if (is_nacl) { if (is_nacl) {
deps += [ "//native_client_sdk/src/libraries/nacl_io" ] deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
} }
} else {
sources += [
"base/relayserver.cc",
"base/relayserver.h",
"base/stunserver.cc",
"base/stunserver.h",
"base/turnserver.cc",
"base/turnserver.h",
]
} }
} }
@ -139,6 +130,7 @@ if (rtc_include_tests) {
"base/testturnserver.h", "base/testturnserver.h",
] ]
deps = [ deps = [
":p2p_server_utils",
":rtc_p2p", ":rtc_p2p",
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:ortc_api", "../api:ortc_api",
@ -180,6 +172,7 @@ if (rtc_include_tests) {
"client/basicportallocator_unittest.cc", "client/basicportallocator_unittest.cc",
] ]
deps = [ deps = [
":p2p_server_utils",
":p2p_test_utils", ":p2p_test_utils",
":rtc_p2p", ":rtc_p2p",
"../api:ortc_api", "../api:ortc_api",
@ -200,6 +193,25 @@ if (rtc_include_tests) {
} }
} }
rtc_source_set("p2p_server_utils") {
testonly = true
sources = [
"base/relayserver.cc",
"base/relayserver.h",
"base/stunserver.cc",
"base/stunserver.h",
"base/turnserver.cc",
"base/turnserver.h",
]
deps = [
":rtc_p2p",
"../rtc_base:checks",
"../rtc_base:rtc_base",
"../rtc_base/third_party/sigslot",
"//third_party/abseil-cpp/absl/memory",
]
}
rtc_static_library("libstunprober") { rtc_static_library("libstunprober") {
visibility = [ "*" ] visibility = [ "*" ]
sources = [ sources = [