Index: build/common.gypi |
=================================================================== |
--- build/common.gypi (revision 142108) |
+++ build/common.gypi (working copy) |
@@ -479,6 +479,12 @@ |
'linux_use_gold_flags%': 0, |
}], |
+ ['OS=="android"', { |
+ 'enable_captive_portal_detection%': 0, |
+ }, { |
+ 'enable_captive_portal_detection%': 1, |
+ }], |
+ |
# Enable Skia UI text drawing incrementally on different platforms. |
# http://crbug.com/105550 |
# |
@@ -559,6 +565,7 @@ |
'test_isolation_outdir%': '<(test_isolation_outdir)', |
'enable_automation%': '<(enable_automation)', |
'enable_printing%': '<(enable_printing)', |
+ 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', |
'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)', |
'enable_task_manager%': '<(enable_task_manager)', |
'platformsdk_path%': '<(platformsdk_path)', |
@@ -1518,6 +1525,9 @@ |
['enable_printing==1', { |
'defines': ['ENABLE_PRINTING=1'], |
}], |
+ ['enable_captive_portal_detection==1', { |
+ 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'], |
+ }], |
], # conditions for 'target_defaults' |
'target_conditions': [ |
['enable_wexit_time_destructors==1', { |