| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 094b7e216d4a814b56c15473bae6d9360c9a9a75..26a65c86d8020ca30d8c2eca5d3027193c3db229 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -123,6 +123,14 @@
|
| # Set ARM architecture version.
|
| 'arm_version%': 7,
|
|
|
| +
|
| + # MDNS is disabled by default.
|
| + 'enable_mdns%' : 0,
|
| +
|
| + # DNS-SD is disabled by default
|
| + 'enable_service_discovery%': 0,
|
| +
|
| +
|
| 'conditions': [
|
| # Set default value of toolkit_views based on OS.
|
| ['OS=="win" or chromeos==1 or use_aura==1', {
|
| @@ -192,6 +200,8 @@
|
| 'branding%': '<(branding)',
|
| 'arm_version%': '<(arm_version)',
|
| 'linux_lsb_release%': '<(linux_lsb_release)',
|
| + 'enable_mdns%' : '<(enable_mdns)',
|
| + 'enable_service_discovery%' : '<(enable_service_discovery)',
|
|
|
| # Set to 1 to enable fast builds. Set to 2 for even faster builds
|
| # (it disables debug info for fastest compilation - only for use
|
| @@ -680,6 +690,9 @@
|
| }, {
|
| 'use_openmax_dl_fft%': 0,
|
| }],
|
| + [ 'enable_service_discovery == 1', {
|
| + 'enable_mdns': 1,
|
| + }],
|
| ],
|
|
|
| # Set this to 1 to enable use of concatenated impulse responses
|
| @@ -829,6 +842,8 @@
|
| '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)',
|
| + 'enable_service_discovery%' : '<(enable_service_discovery)',
|
|
|
| # Use system mesa instead of bundled one.
|
| 'use_system_mesa%': 0,
|
| @@ -1087,9 +1102,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
|
| @@ -2240,7 +2252,10 @@
|
| }],
|
| ['enable_mdns==1', {
|
| 'defines': ['ENABLE_MDNS=1'],
|
| - }]
|
| + }],
|
| + ['enable_service_discovery==1', {
|
| + 'defines': ['ENABLE_SERVICE_DISCOVERY=1'],
|
| + }],
|
| ], # conditions for 'target_defaults'
|
| 'target_conditions': [
|
| ['enable_wexit_time_destructors==1', {
|
|
|