commit 5a601d909fa4231d498a920ca74eec96a3c593b0
author wjywbs <wjywbs@gmail.com> Wed Aug 31 21:03:52 2016
committer Commit bot <commit-bot@chromium.org> Wed Aug 31 21:04:00 2016
tree bbae6ecf2925f533c87373a2a42686db5073d0af
parent ebd9fd7918c5979dee0c6be85d8bcf23c485d742

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

diff --git a/webrtc/p2p/BUILD.gn b/webrtc/p2p/BUILD.gn
index 32b7fa4..ddd2956 100644
--- a/webrtc/p2p/BUILD.gn
+++ b/webrtc/p2p/BUILD.gn
@@ -162,3 +162,21 @@
     "../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",
+  ]
+}

webrtc/p2p/stunprober/main.cc

diff --git a/webrtc/p2p/stunprober/main.cc b/webrtc/p2p/stunprober/main.cc
index 9d0fff8..a3ce992 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;