From 5a601d909fa4231d498a920ca74eec96a3c593b0 Mon Sep 17 00:00:00 2001 From: wjywbs Date: Wed, 31 Aug 2016 14:03:52 -0700 Subject: [PATCH] Fix multiple definitions of BasicPacketSocketFactory error and add stunprober in GN. R=pthatcher@webrtc.org Review-Url: https://codereview.webrtc.org/2289563002 Cr-Commit-Position: refs/heads/master@{#14006} --- webrtc/p2p/BUILD.gn | 18 ++++++++++++++++++ webrtc/p2p/stunprober/main.cc | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/webrtc/p2p/BUILD.gn b/webrtc/p2p/BUILD.gn index 32b7fa4c53..ddd295651e 100644 --- a/webrtc/p2p/BUILD.gn +++ b/webrtc/p2p/BUILD.gn @@ -162,3 +162,21 @@ source_set("libstunprober") { "../base:rtc_base", ] } + +executable("stun_prober") { + sources = [ + "stunprober/main.cc", + ] + + if (!build_with_chromium && is_clang) { + # Suppress warnings from Chrome's Clang plugins. + # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. + configs -= [ "//build/config/clang:find_bad_constructs" ] + } + + deps = [ + ":libstunprober", + ":rtc_p2p", + "../system_wrappers:field_trial_default", + ] +} diff --git a/webrtc/p2p/stunprober/main.cc b/webrtc/p2p/stunprober/main.cc index 9d0fff8732..a3ce992e9f 100644 --- a/webrtc/p2p/stunprober/main.cc +++ b/webrtc/p2p/stunprober/main.cc @@ -26,7 +26,7 @@ #include "webrtc/base/stringutils.h" #include "webrtc/base/thread.h" #include "webrtc/base/timeutils.h" -#include "webrtc/p2p/base/basicpacketsocketfactory.cc" +#include "webrtc/p2p/base/basicpacketsocketfactory.h" #include "webrtc/p2p/stunprober/stunprober.h" using stunprober::StunProber;