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}
This commit is contained in:
wjywbs 2016-08-31 14:03:52 -07:00 committed by Commit bot
parent ebd9fd7918
commit 5a601d909f
2 changed files with 19 additions and 1 deletions

View File

@ -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",
]
}

View File

@ -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;