From 3f9dd7c0cc0df1d1e83642163a9eecc0c99a863a Mon Sep 17 00:00:00 2001 From: Per Date: Thu, 1 Sep 2016 17:05:55 +0200 Subject: [PATCH] Do not build stun_prober within Chrome on gn. stun_prober does not compile on win. https://build.chromium.org/p/tryserver.chromium.win/builders/win_clang/builds/79068/steps/compile%20%28with%20patch%29/logs/stdio TBR=pthatcher@webrtc.org BUG= Review URL: https://codereview.webrtc.org/2303783002 . Cr-Commit-Position: refs/heads/master@{#14024} --- webrtc/p2p/BUILD.gn | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/webrtc/p2p/BUILD.gn b/webrtc/p2p/BUILD.gn index 7866f0aee8..5f0f5220b4 100644 --- a/webrtc/p2p/BUILD.gn +++ b/webrtc/p2p/BUILD.gn @@ -163,21 +163,25 @@ source_set("libstunprober") { ] } -executable("stun_prober") { - sources = [ - "stunprober/main.cc", - ] +if (!build_with_chromium) { + # Doesn't build within Chrome on Win. - configs += [ "..:common_config" ] - 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" ] + executable("stun_prober") { + sources = [ + "stunprober/main.cc", + ] + + configs += [ "..:common_config" ] + 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", + ] } - - deps = [ - ":libstunprober", - ":rtc_p2p", - "../system_wrappers:field_trial_default", - ] }