Index: build/common.gypi |
=================================================================== |
--- build/common.gypi (revision 139574) |
+++ build/common.gypi (working copy) |
@@ -492,6 +492,12 @@ |
'enable_automation%': 1, |
}], |
+ ['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 |
# |
@@ -573,6 +579,7 @@ |
'test_isolation_mode%': '<(test_isolation_mode)', |
'test_isolation_outdir%': '<(test_isolation_outdir)', |
'enable_automation%': '<(enable_automation)', |
+ '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)', |
@@ -1527,6 +1534,9 @@ |
['enable_automation==1', { |
'defines': ['ENABLE_AUTOMATION=1'], |
}], |
+ ['enable_captive_portal_detection==1', { |
+ 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'], |
+ }], |
], # conditions for 'target_defaults' |
'target_conditions': [ |
['enable_wexit_time_destructors==1', { |