| 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 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 396 }], | 396 }], |
| 397 | 397 |
| 398 # linux_use_gold_flags: whether to use build flags that rely on gold. | 398 # linux_use_gold_flags: whether to use build flags that rely on gold. |
| 399 # On by default for x64 Linux. Temporarily off for ChromeOS as | 399 # On by default for x64 Linux. Temporarily off for ChromeOS as |
| 400 # it failed on a buildbot. | 400 # it failed on a buildbot. |
| 401 ['host_arch=="x64" and chromeos==0', { | 401 ['host_arch=="x64" and chromeos==0', { |
| 402 'linux_use_gold_flags%': 1, | 402 'linux_use_gold_flags%': 1, |
| 403 }, { | 403 }, { |
| 404 'linux_use_gold_flags%': 0, | 404 'linux_use_gold_flags%': 0, |
| 405 }], | 405 }], |
| 406 | |
| 407 # Enable canvas_skia_skia.cc incrementally on different platforms. | |
| 408 # http://crbug.com/105550 | |
| 409 ['OS=="win"', { | |
| 410 'use_canvas_skia_skia%': 1, | |
| 411 }], | |
| 412 ], | 406 ], |
| 413 }, | 407 }, |
| 414 | 408 |
| 415 # Copy conditionally-set variables out one scope. | 409 # Copy conditionally-set variables out one scope. |
| 416 'branding%': '<(branding)', | 410 'branding%': '<(branding)', |
| 417 'buildtype%': '<(buildtype)', | 411 'buildtype%': '<(buildtype)', |
| 418 'target_arch%': '<(target_arch)', | 412 'target_arch%': '<(target_arch)', |
| 419 'host_arch%': '<(host_arch)', | 413 'host_arch%': '<(host_arch)', |
| 420 'library%': 'static_library', | 414 'library%': 'static_library', |
| 421 'toolkit_views%': '<(toolkit_views)', | 415 'toolkit_views%': '<(toolkit_views)', |
| (...skipping 2380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2802 # settings in target dicts. SYMROOT is a special case, because many other | 2796 # settings in target dicts. SYMROOT is a special case, because many other |
| 2803 # Xcode variables depend on it, including variables such as | 2797 # Xcode variables depend on it, including variables such as |
| 2804 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 2798 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 2805 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 2799 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 2806 # files to appear (when present) in the UI as actual files and not red | 2800 # files to appear (when present) in the UI as actual files and not red |
| 2807 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 2801 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 2808 # and therefore SYMROOT, needs to be set at the project level. | 2802 # and therefore SYMROOT, needs to be set at the project level. |
| 2809 'SYMROOT': '<(DEPTH)/xcodebuild', | 2803 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 2810 }, | 2804 }, |
| 2811 } | 2805 } |
| OLD | NEW |