Nuke p2p/base/stun.h
All downstream users have been moved to the new one.
Bug: webrtc:11091
Change-Id: Ia18d0df94a7b95b1a58b4a53cfb195c61ef59ffd
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/160201
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29873}
diff --git a/api/transport/BUILD.gn b/api/transport/BUILD.gn
index d9260c5..7f39975 100644
--- a/api/transport/BUILD.gn
+++ b/api/transport/BUILD.gn
@@ -154,7 +154,6 @@
]
deps = [
":stun_types",
- "../../p2p:stun_types",
"../../rtc_base",
"../../rtc_base:macromagic",
"../../rtc_base:rtc_base_approved",
diff --git a/media/BUILD.gn b/media/BUILD.gn
index c38ce7d..009741f 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -95,7 +95,6 @@
"../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",
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index 945c679..a984e8a 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -15,20 +15,6 @@
]
}
-# TODO(bugs.webrtc.org/11091): Remove this target when downstream is updated.
-rtc_library("stun_types") {
- sources = [
- "base/empty.cc",
- "base/stun.h",
- ]
- deps = [
- "../api/transport:stun_types",
- "../rtc_base:checks",
- "../rtc_base:rtc_base",
- "../rtc_base:rtc_base_approved",
- ]
-}
-
rtc_library("rtc_p2p") {
visibility = [ "*" ]
sources = [
@@ -101,7 +87,6 @@
]
deps = [
- ":stun_types",
"../api:libjingle_peerconnection_api",
"../api:packet_socket_factory",
"../api:rtc_error",
@@ -178,7 +163,6 @@
":fake_port_allocator",
":p2p_server_utils",
":rtc_p2p",
- ":stun_types",
"../api:libjingle_peerconnection_api",
"../api:packet_socket_factory",
"../api/crypto:options",
@@ -223,7 +207,6 @@
":p2p_server_utils",
":p2p_test_utils",
":rtc_p2p",
- ":stun_types",
"../api:libjingle_peerconnection_api",
"../api:packet_socket_factory",
"../api:scoped_refptr",
@@ -257,7 +240,6 @@
]
deps = [
":rtc_p2p",
- ":stun_types",
"../api:packet_socket_factory",
"../api/transport:stun_types",
"../rtc_base",
@@ -277,7 +259,6 @@
deps = [
":rtc_p2p",
- ":stun_types",
"../api:packet_socket_factory",
"../api/transport:stun_types",
"../rtc_base",
diff --git a/p2p/base/empty.cc b/p2p/base/empty.cc
deleted file mode 100644
index e7fccda..0000000
--- a/p2p/base/empty.cc
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright 2019 The WebRTC Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-// TODO(bugs.webrtc.org/11091): nuke this after downstream updated.
diff --git a/p2p/base/stun.h b/p2p/base/stun.h
deleted file mode 100644
index 2249c65..0000000
--- a/p2p/base/stun.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2004 The WebRTC Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef P2P_BASE_STUN_H_
-#define P2P_BASE_STUN_H_
-
-// TODO(bugs.webrtc.org/11091): Delete this header when downstream is updated.
-#include "api/transport/stun.h"
-
-#endif // P2P_BASE_STUN_H_