summaryrefslogtreecommitdiffstats
path: root/build/common.gypi
diff options
context:
space:
mode:
authornoamsml@chromium.org <noamsml@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-23 07:45:36 +0000
committernoamsml@chromium.org <noamsml@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-23 07:45:36 +0000
commit4b202aef36bd939ff0806ea91e2d2b7c7b369219 (patch)
tree3ed13d280d8b8bd6874ab4890292458c40a212fb /build/common.gypi
parent07e92a5667bfa8b18e3681edcbbdb7df2f7ae454 (diff)
downloadchromium_src-4b202aef36bd939ff0806ea91e2d2b7c7b369219.zip
chromium_src-4b202aef36bd939ff0806ea91e2d2b7c7b369219.tar.gz
chromium_src-4b202aef36bd939ff0806ea91e2d2b7c7b369219.tar.bz2
Add enable_wifi_bootstrapping variable to common.gypi
This should simplify ifdefs and ensure flexibility as we move to new platforms. BUG=370071 Review URL: https://codereview.chromium.org/294173002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
-rw-r--r--build/common.gypi11
1 files changed, 11 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index d974a8e..1ed618b 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -552,6 +552,7 @@
'data_reduction_proxy_probe_url%' : '',
'enable_mdns%' : 0,
'enable_service_discovery%': 0,
+ 'enable_wifi_bootstrapping%': 0,
'enable_hangout_services_extension%': 0,
# Enable the Syzygy optimization step.
@@ -918,6 +919,9 @@
'data_reduction_dev_host%': 'http://proxy-dev.googlezip.net:80/',
'data_reduction_fallback_host%': 'http://compress.googlezip.net:80/',
}],
+ ['OS=="win" or OS=="mac"', {
+ 'enable_wifi_bootstrapping%' : 1,
+ }],
],
# Set this to 1 to enable use of concatenated impulse responses
@@ -1097,6 +1101,7 @@
'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)',
'enable_mdns%' : '<(enable_mdns)',
'enable_service_discovery%' : '<(enable_service_discovery)',
+ 'enable_wifi_bootstrapping%': '<(enable_wifi_bootstrapping)',
'enable_hangout_services_extension%' : '<(enable_hangout_services_extension)',
'v8_optimized_debug%': '<(v8_optimized_debug)',
'proprietary_codecs%': '<(proprietary_codecs)',
@@ -1977,6 +1982,9 @@
['notifications==1', {
'grit_defines': ['-D', 'enable_notifications'],
}],
+ ['enable_wifi_bootstrapping==1', {
+ 'grit_defines': ['-D', 'enable_wifi_bootstrapping'],
+ }],
['enable_resource_whitelist_generation==1 and OS!="win"', {
'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("whitelisted_resource_{numeric_id}") {numeric_id}'],
}],
@@ -2695,6 +2703,9 @@
['enable_service_discovery==1', {
'defines' : [ 'ENABLE_SERVICE_DISCOVERY=1' ],
}],
+ ['enable_wifi_bootstrapping==1', {
+ 'defines' : [ 'ENABLE_WIFI_BOOTSTRAPPING=1' ],
+ }],
['enable_hangout_services_extension==1', {
'defines': ['ENABLE_HANGOUT_SERVICES_EXTENSION=1'],
}],