OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 # IMPORTANT: | 5 # IMPORTANT: |
6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
8 { | 8 { |
9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
472 | 472 |
473 # linux_use_gold_flags: whether to use build flags that rely on gold. | 473 # linux_use_gold_flags: whether to use build flags that rely on gold. |
474 # On by default for x64 Linux. Temporarily off for ChromeOS as | 474 # On by default for x64 Linux. Temporarily off for ChromeOS as |
475 # it failed on a buildbot. | 475 # it failed on a buildbot. |
476 ['OS=="linux" and chromeos==0', { | 476 ['OS=="linux" and chromeos==0', { |
477 'linux_use_gold_flags%': 1, | 477 'linux_use_gold_flags%': 1, |
478 }, { | 478 }, { |
479 'linux_use_gold_flags%': 0, | 479 'linux_use_gold_flags%': 0, |
480 }], | 480 }], |
481 | 481 |
| 482 ['OS=="android"', { |
| 483 'enable_captive_portal_detection%': 0, |
| 484 }, { |
| 485 'enable_captive_portal_detection%': 1, |
| 486 }], |
| 487 |
482 # Enable Skia UI text drawing incrementally on different platforms. | 488 # Enable Skia UI text drawing incrementally on different platforms. |
483 # http://crbug.com/105550 | 489 # http://crbug.com/105550 |
484 # | 490 # |
485 # On Aura, this allows per-tile painting to be used in the browser | 491 # On Aura, this allows per-tile painting to be used in the browser |
486 # compositor. | 492 # compositor. |
487 ['OS!="mac" and OS!="android"', { | 493 ['OS!="mac" and OS!="android"', { |
488 'use_canvas_skia%': 1, | 494 'use_canvas_skia%': 1, |
489 }], | 495 }], |
490 ], | 496 ], |
491 }, | 497 }, |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
552 'enable_themes%': '<(enable_themes)', | 558 'enable_themes%': '<(enable_themes)', |
553 'enable_background%': '<(enable_background)', | 559 'enable_background%': '<(enable_background)', |
554 'enable_promo_resource_service%': '<(enable_promo_resource_service)', | 560 'enable_promo_resource_service%': '<(enable_promo_resource_service)', |
555 'linux_use_gold_binary%': '<(linux_use_gold_binary)', | 561 'linux_use_gold_binary%': '<(linux_use_gold_binary)', |
556 'linux_use_gold_flags%': '<(linux_use_gold_flags)', | 562 'linux_use_gold_flags%': '<(linux_use_gold_flags)', |
557 'use_canvas_skia%': '<(use_canvas_skia)', | 563 'use_canvas_skia%': '<(use_canvas_skia)', |
558 'test_isolation_mode%': '<(test_isolation_mode)', | 564 'test_isolation_mode%': '<(test_isolation_mode)', |
559 'test_isolation_outdir%': '<(test_isolation_outdir)', | 565 'test_isolation_outdir%': '<(test_isolation_outdir)', |
560 'enable_automation%': '<(enable_automation)', | 566 'enable_automation%': '<(enable_automation)', |
561 'enable_printing%': '<(enable_printing)', | 567 'enable_printing%': '<(enable_printing)', |
| 568 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', |
562 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)', | 569 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)', |
563 'enable_task_manager%': '<(enable_task_manager)', | 570 'enable_task_manager%': '<(enable_task_manager)', |
564 'platformsdk_path%': '<(platformsdk_path)', | 571 'platformsdk_path%': '<(platformsdk_path)', |
565 'wix_path%': '<(wix_path)', | 572 'wix_path%': '<(wix_path)', |
566 'android_upstream_bringup%': '<(android_upstream_bringup)', | 573 'android_upstream_bringup%': '<(android_upstream_bringup)', |
567 | 574 |
568 # Use system yasm instead of bundled one. | 575 # Use system yasm instead of bundled one. |
569 'use_system_yasm%': 0, | 576 'use_system_yasm%': 0, |
570 | 577 |
571 # Default to enabled PIE; this is important for ASLR but we may need to be | 578 # Default to enabled PIE; this is important for ASLR but we may need to be |
(...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1511 }], | 1518 }], |
1512 ['enable_promo_resource_service==1', { | 1519 ['enable_promo_resource_service==1', { |
1513 'defines': ['ENABLE_PROMO_RESOURCE_SERVICE=1'], | 1520 'defines': ['ENABLE_PROMO_RESOURCE_SERVICE=1'], |
1514 }], | 1521 }], |
1515 ['enable_automation==1', { | 1522 ['enable_automation==1', { |
1516 'defines': ['ENABLE_AUTOMATION=1'], | 1523 'defines': ['ENABLE_AUTOMATION=1'], |
1517 }], | 1524 }], |
1518 ['enable_printing==1', { | 1525 ['enable_printing==1', { |
1519 'defines': ['ENABLE_PRINTING=1'], | 1526 'defines': ['ENABLE_PRINTING=1'], |
1520 }], | 1527 }], |
| 1528 ['enable_captive_portal_detection==1', { |
| 1529 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'], |
| 1530 }], |
1521 ], # conditions for 'target_defaults' | 1531 ], # conditions for 'target_defaults' |
1522 'target_conditions': [ | 1532 'target_conditions': [ |
1523 ['enable_wexit_time_destructors==1', { | 1533 ['enable_wexit_time_destructors==1', { |
1524 'conditions': [ | 1534 'conditions': [ |
1525 [ 'clang==1', { | 1535 [ 'clang==1', { |
1526 'cflags': [ | 1536 'cflags': [ |
1527 '-Wexit-time-destructors', | 1537 '-Wexit-time-destructors', |
1528 ], | 1538 ], |
1529 'xcode_settings': { | 1539 'xcode_settings': { |
1530 'WARNING_CFLAGS': [ | 1540 'WARNING_CFLAGS': [ |
(...skipping 1595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3126 # settings in target dicts. SYMROOT is a special case, because many other | 3136 # settings in target dicts. SYMROOT is a special case, because many other |
3127 # Xcode variables depend on it, including variables such as | 3137 # Xcode variables depend on it, including variables such as |
3128 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3138 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
3129 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3139 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
3130 # files to appear (when present) in the UI as actual files and not red | 3140 # files to appear (when present) in the UI as actual files and not red |
3131 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3141 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
3132 # and therefore SYMROOT, needs to be set at the project level. | 3142 # and therefore SYMROOT, needs to be set at the project level. |
3133 'SYMROOT': '<(DEPTH)/xcodebuild', | 3143 'SYMROOT': '<(DEPTH)/xcodebuild', |
3134 }, | 3144 }, |
3135 } | 3145 } |
OLD | NEW |