| 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 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 473 'linux_use_gold_flags%': 0, | 473 'linux_use_gold_flags%': 0, |
| 474 }], | 474 }], |
| 475 | 475 |
| 476 # Enable automation on platforms other than Android. | 476 # Enable automation on platforms other than Android. |
| 477 ['OS=="android"', { | 477 ['OS=="android"', { |
| 478 'enable_automation%': 0, | 478 'enable_automation%': 0, |
| 479 }, { | 479 }, { |
| 480 'enable_automation%': 1, | 480 'enable_automation%': 1, |
| 481 }], | 481 }], |
| 482 | 482 |
| 483 ['OS=="android"', { |
| 484 'enable_captive_portal_detection%': 0, |
| 485 }, { |
| 486 'enable_captive_portal_detection%': 1, |
| 487 }], |
| 488 |
| 483 # Enable Skia UI text drawing incrementally on different platforms. | 489 # Enable Skia UI text drawing incrementally on different platforms. |
| 484 # http://crbug.com/105550 | 490 # http://crbug.com/105550 |
| 485 # | 491 # |
| 486 # On Aura, this allows per-tile painting to be used in the browser | 492 # On Aura, this allows per-tile painting to be used in the browser |
| 487 # compositor. | 493 # compositor. |
| 488 ['OS!="mac" and OS!="android"', { | 494 ['OS!="mac" and OS!="android"', { |
| 489 'use_canvas_skia%': 1, | 495 'use_canvas_skia%': 1, |
| 490 }], | 496 }], |
| 491 ], | 497 ], |
| 492 }, | 498 }, |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 552 'enable_session_service%': '<(enable_session_service)', | 558 'enable_session_service%': '<(enable_session_service)', |
| 553 'enable_themes%': '<(enable_themes)', | 559 'enable_themes%': '<(enable_themes)', |
| 554 'enable_background%': '<(enable_background)', | 560 'enable_background%': '<(enable_background)', |
| 555 'enable_promo_resource_service%': '<(enable_promo_resource_service)', | 561 'enable_promo_resource_service%': '<(enable_promo_resource_service)', |
| 556 'linux_use_gold_binary%': '<(linux_use_gold_binary)', | 562 'linux_use_gold_binary%': '<(linux_use_gold_binary)', |
| 557 'linux_use_gold_flags%': '<(linux_use_gold_flags)', | 563 'linux_use_gold_flags%': '<(linux_use_gold_flags)', |
| 558 'use_canvas_skia%': '<(use_canvas_skia)', | 564 'use_canvas_skia%': '<(use_canvas_skia)', |
| 559 'test_isolation_mode%': '<(test_isolation_mode)', | 565 'test_isolation_mode%': '<(test_isolation_mode)', |
| 560 'test_isolation_outdir%': '<(test_isolation_outdir)', | 566 'test_isolation_outdir%': '<(test_isolation_outdir)', |
| 561 'enable_automation%': '<(enable_automation)', | 567 'enable_automation%': '<(enable_automation)', |
| 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 925 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1497 }], | 1504 }], |
| 1498 ['enable_background==1', { | 1505 ['enable_background==1', { |
| 1499 'defines': ['ENABLE_BACKGROUND=1'], | 1506 'defines': ['ENABLE_BACKGROUND=1'], |
| 1500 }], | 1507 }], |
| 1501 ['enable_promo_resource_service==1', { | 1508 ['enable_promo_resource_service==1', { |
| 1502 'defines': ['ENABLE_PROMO_RESOURCE_SERVICE=1'], | 1509 'defines': ['ENABLE_PROMO_RESOURCE_SERVICE=1'], |
| 1503 }], | 1510 }], |
| 1504 ['enable_automation==1', { | 1511 ['enable_automation==1', { |
| 1505 'defines': ['ENABLE_AUTOMATION=1'], | 1512 'defines': ['ENABLE_AUTOMATION=1'], |
| 1506 }], | 1513 }], |
| 1514 ['enable_captive_portal_detection==1', { |
| 1515 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'], |
| 1516 }], |
| 1507 ], # conditions for 'target_defaults' | 1517 ], # conditions for 'target_defaults' |
| 1508 'target_conditions': [ | 1518 'target_conditions': [ |
| 1509 ['enable_wexit_time_destructors==1', { | 1519 ['enable_wexit_time_destructors==1', { |
| 1510 'conditions': [ | 1520 'conditions': [ |
| 1511 [ 'clang==1', { | 1521 [ 'clang==1', { |
| 1512 'cflags': [ | 1522 'cflags': [ |
| 1513 '-Wexit-time-destructors', | 1523 '-Wexit-time-destructors', |
| 1514 ], | 1524 ], |
| 1515 'xcode_settings': { | 1525 'xcode_settings': { |
| 1516 'WARNING_CFLAGS': [ | 1526 'WARNING_CFLAGS': [ |
| (...skipping 1595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3112 # settings in target dicts. SYMROOT is a special case, because many other | 3122 # settings in target dicts. SYMROOT is a special case, because many other |
| 3113 # Xcode variables depend on it, including variables such as | 3123 # Xcode variables depend on it, including variables such as |
| 3114 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3124 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3115 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3125 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3116 # files to appear (when present) in the UI as actual files and not red | 3126 # files to appear (when present) in the UI as actual files and not red |
| 3117 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3127 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3118 # and therefore SYMROOT, needs to be set at the project level. | 3128 # and therefore SYMROOT, needs to be set at the project level. |
| 3119 'SYMROOT': '<(DEPTH)/xcodebuild', | 3129 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3120 }, | 3130 }, |
| 3121 } | 3131 } |
| OLD | NEW |