zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This is a reland of e284c521f76d810e9c68a238e4821e8f0f99a2cd

Original change's description:
> Move relay server code to a test-only target p2p_server_utils.
> 
> 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}

Bug: webrtc:9798
Change-Id: I82c6c7d9524217237ad83839cc0fe6f2c184b0e3
Reviewed-on: https://webrtc-review.googlesource.com/c/108300
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26024}
This commit is contained in:
Niels Möller
2018-11-08 16:47:14 +01:00
committed by Commit Bot
parent 194d4d20fb
commit a134204aa3
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/BUILD.gn
View File

@ -779,6 +779,7 @@ if (is_linux || is_win) {
"relayserver/relayserver_main.cc",
]
deps = [
"../p2p:p2p_server_utils",
"../p2p:rtc_p2p",
"../pc:rtc_pc",
"../rtc_base:rtc_base",
@ -796,6 +797,7 @@ if (is_linux || is_win) {
]
deps = [
":read_auth_file",
"../p2p:p2p_server_utils",
"../p2p:rtc_p2p",
"../pc:rtc_pc",
"../rtc_base:rtc_base",
@ -812,6 +814,7 @@ if (is_linux || is_win) {
"stunserver/stunserver_main.cc",
]
deps = [
"../p2p:p2p_server_utils",
"../p2p:rtc_p2p",
"../pc:rtc_pc",
"../rtc_base:rtc_base",

30
p2p/BUILD.gn
View File

@ -109,15 +109,6 @@ rtc_static_library("rtc_p2p") {
if (is_nacl) {
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",
]
deps = [
":p2p_server_utils",
":rtc_p2p",
"../api:libjingle_peerconnection_api",
"../api:ortc_api",
@ -181,6 +173,7 @@ if (rtc_include_tests) {
"client/basicportallocator_unittest.cc",
]
deps = [
":p2p_server_utils",
":p2p_test_utils",
":rtc_p2p",
"../api:libjingle_peerconnection_api",
@ -207,6 +200,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") {
visibility = [ "*" ]
sources = [