From a134204aa3ab2b09fd109c59bc3472c92d9e0ae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@webrtc.org>
Date: Thu, 8 Nov 2018 16:47:14 +0100
Subject: [PATCH] Reland "Move relay server code to a test-only target
 p2p_server_utils."

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}
---
 examples/BUILD.gn |  3 +++
 p2p/BUILD.gn      | 30 +++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 3632811338..041bf3e0c2 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -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",
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index ce390bc6bf..a2aa5ff7d7 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -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 = [