summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authornoamsml@chromium.org <noamsml@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-10 19:21:05 +0000
committernoamsml@chromium.org <noamsml@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-10 19:21:05 +0000
commit5e131c9f6dbeb67391020d1a101df0f36b0df922 (patch)
treeaf487443d84df729ead5c98e93dc854c2ef36147 /build
parent3d266eb51d50a4ca49927b978e339cbfb4412b2e (diff)
downloadchromium_src-5e131c9f6dbeb67391020d1a101df0f36b0df922.zip
chromium_src-5e131c9f6dbeb67391020d1a101df0f36b0df922.tar.gz
chromium_src-5e131c9f6dbeb67391020d1a101df0f36b0df922.tar.bz2
Compile with enable_mdns by default on Windows and Linux
This will compile MDns support by default on Windows and Linux. Note that this is separate from actually enabling MDns, which will be gated by the "--enable-device-discovery" flag. BUG=233821 Review URL: https://chromiumcodereview.appspot.com/18374002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi8
1 files changed, 5 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 467dd74..2852a98 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -421,6 +421,7 @@
'spdy_proxy_auth_origin%' : '',
'spdy_proxy_auth_property%' : '',
'spdy_proxy_auth_value%' : '',
+ 'enable_mdns%' : 0,
'conditions': [
# A flag for POSIX platforms
@@ -684,6 +685,9 @@
}, {
'use_openmax_dl_fft%': 0,
}],
+ ['OS=="win" or OS=="linux"', {
+ 'enable_mdns%' : 1,
+ }]
],
# Set this to 1 to enable use of concatenated impulse responses
@@ -834,6 +838,7 @@
'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
+ 'enable_mdns%' : '<(enable_mdns)',
# Use system mesa instead of bundled one.
'use_system_mesa%': 0,
@@ -1098,9 +1103,6 @@
# rlz codes for searches but do not use the library.
'enable_rlz%': 0,
- # MDNS is disabled by default.
- 'enable_mdns%' : 0,
-
'conditions': [
# The version of GCC in use, set later in platforms that use GCC and have
# not explicitly chosen to build with clang. Currently, this means all