From 91c824f8494ee15a821de7e58e899c14bb459a6c Mon Sep 17 00:00:00 2001 From: Hannes Landeholm Date: Thu, 5 Sep 2019 23:13:50 +0000 Subject: [PATCH] Revert "New build target p2p:stun_types" This reverts commit 5b4fcb5bf69218c2f42ca2b0cada6c15f2f638e9. Reason for revert: Breaks build Original change's description: > 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 > Reviewed-by: Mirko Bonadei > Reviewed-by: Steve Anton > Cr-Commit-Position: refs/heads/master@{#29036} TBR=steveanton@webrtc.org,mbonadei@webrtc.org,nisse@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:8733 Change-Id: I6e00657a6137ff773325f37ec02ee1014b6fe96b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/151740 Reviewed-by: Hannes Landeholm Commit-Queue: Hannes Landeholm Cr-Commit-Position: refs/heads/master@{#29085} --- media/BUILD.gn | 5 ++++- p2p/BUILD.gn | 19 ++++--------------- test/fuzzers/BUILD.gn | 2 -- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/media/BUILD.gn b/media/BUILD.gn index f010aeaf13..5d8a2b849e 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -89,7 +89,6 @@ 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", @@ -137,6 +136,10 @@ 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 3ef59f3c5d..5b9a5d5ac2 100644 --- a/p2p/BUILD.gn +++ b/p2p/BUILD.gn @@ -15,17 +15,9 @@ 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") { @@ -75,6 +67,8 @@ 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", @@ -98,7 +92,6 @@ rtc_static_library("rtc_p2p") { ] deps = [ - ":stun_types", "../api:libjingle_peerconnection_api", "../api:scoped_refptr", "../api/rtc_event_log", @@ -170,7 +163,6 @@ if (rtc_include_tests) { ":fake_port_allocator", ":p2p_server_utils", ":rtc_p2p", - ":stun_types", "../api:libjingle_peerconnection_api", "../rtc_base", "../rtc_base:gunit_helpers", @@ -216,7 +208,6 @@ 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", @@ -250,7 +241,6 @@ rtc_source_set("p2p_server_utils") { ] deps = [ ":rtc_p2p", - ":stun_types", "../rtc_base", "../rtc_base:checks", "../rtc_base:rtc_base_tests_utils", @@ -269,7 +259,6 @@ 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 7a0f332a54..36183036f2 100644 --- a/test/fuzzers/BUILD.gn +++ b/test/fuzzers/BUILD.gn @@ -428,7 +428,6 @@ webrtc_fuzzer_test("stun_parser_fuzzer") { ] deps = [ "../../p2p:rtc_p2p", - "../../p2p:stun_types", ] seed_corpus = "corpora/stun-corpus" dict = "corpora/stun.tokens" @@ -440,7 +439,6 @@ webrtc_fuzzer_test("stun_validator_fuzzer") { ] deps = [ "../../p2p:rtc_p2p", - "../../p2p:stun_types", ] seed_corpus = "corpora/stun-corpus" dict = "corpora/stun.tokens"