Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Unified Diff: build/common.gypi

Issue 294173002: Add enable_wifi_bootstrapping variable to common.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 5334bb74779d22f69e57629dbd218d242f8f4f23..badc1abc5e12879bba3d5f16fc22d12ebf79a086 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -548,6 +548,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.
@@ -908,6 +909,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
@@ -1086,6 +1090,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)',
@@ -1966,6 +1971,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}'],
}],
@@ -2681,6 +2689,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'],
}],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698