From 5b4fcb5bf69218c2f42ca2b0cada6c15f2f638e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@webrtc.org>
Date: Mon, 2 Sep 2019 13:09:58 +0200
Subject: [PATCH] New build target p2p:stun_types

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}
---
 media/BUILD.gn        |  5 +----
 p2p/BUILD.gn          | 19 +++++++++++++++----
 test/fuzzers/BUILD.gn |  2 ++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/media/BUILD.gn b/media/BUILD.gn
index 426b2a0452..fd995e64d9 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -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") {
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index 5b9a5d5ac2..3ef59f3c5d 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -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",
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index 36183036f2..7a0f332a54 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -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"