From 4191a81065bb53fdc36476e7cdd46b16cbf74b2d Mon Sep 17 00:00:00 2001
From: Oleh Prypin <oprypin@webrtc.org>
Date: Thu, 25 Oct 2018 07:58:30 +0000
Subject: [PATCH] Revert "Move relay server code to a test-only target
 p2p_server_utils."

This reverts commit e284c521f76d810e9c68a238e4821e8f0f99a2cd.

Reason for revert: Breaks downstream project

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}

TBR=mbonadei@webrtc.org,nisse@webrtc.org,perkj@webrtc.org

Change-Id: I8e66b556f0be4979e5ef223d93c97b4f993ab2f9
No-Try: true
Bug: webrtc:9798
Reviewed-on: https://webrtc-review.googlesource.com/c/107737
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25349}
---
 examples/BUILD.gn |  3 ---
 p2p/BUILD.gn      | 30 +++++++++---------------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 2ed599a212..8d5a8f3abe 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -731,7 +731,6 @@ if (is_linux || is_win) {
       "relayserver/relayserver_main.cc",
     ]
     deps = [
-      "../p2p:p2p_server_utils",
       "../p2p:rtc_p2p",
       "../pc:rtc_pc",
       "../rtc_base:rtc_base",
@@ -748,7 +747,6 @@ if (is_linux || is_win) {
       "turnserver/turnserver_main.cc",
     ]
     deps = [
-      "../p2p:p2p_server_utils",
       "../p2p:rtc_p2p",
       "../pc:rtc_pc",
       "../rtc_base:rtc_base",
@@ -765,7 +763,6 @@ 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 60dbd312f2..252d182400 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -109,6 +109,15 @@ 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",
+    ]
   }
 }
 
@@ -130,7 +139,6 @@ if (rtc_include_tests) {
       "base/testturnserver.h",
     ]
     deps = [
-      ":p2p_server_utils",
       ":rtc_p2p",
       "../api:libjingle_peerconnection_api",
       "../api:ortc_api",
@@ -172,7 +180,6 @@ if (rtc_include_tests) {
       "client/basicportallocator_unittest.cc",
     ]
     deps = [
-      ":p2p_server_utils",
       ":p2p_test_utils",
       ":rtc_p2p",
       "../api:ortc_api",
@@ -193,25 +200,6 @@ 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 = [