From 300713d66e1fedd172e1b6d38e35cda8a5ce2b56 Mon Sep 17 00:00:00 2001 From: "noamsml@chromium.org" Date: Fri, 23 May 2014 07:45:36 +0000 Subject: [PATCH] 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: http://src.chromium.org/svn/trunk/src/build@272433 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- common.gypi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/common.gypi b/common.gypi index d974a8e47..1ed618b14 100644 --- a/common.gypi +++ b/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'], }],