| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 'toolkit_uses_gtk%': 0, | 278 'toolkit_uses_gtk%': 0, |
| 279 'use_x11%': 0, | 279 'use_x11%': 0, |
| 280 }, { | 280 }, { |
| 281 # TODO(dnicoara) Wayland build should have these disabled, but | 281 # TODO(dnicoara) Wayland build should have these disabled, but |
| 282 # currently GTK and X is too spread and it's hard to completely | 282 # currently GTK and X is too spread and it's hard to completely |
| 283 # remove every dependency. | 283 # remove every dependency. |
| 284 'use_glib%': 1, | 284 'use_glib%': 1, |
| 285 'toolkit_uses_gtk%': 1, | 285 'toolkit_uses_gtk%': 1, |
| 286 'use_x11%': 1, | 286 'use_x11%': 1, |
| 287 }], | 287 }], |
| 288 # We always use skia text rendering in Aura on Windows, since GDI |
| 289 # doesn't agree with our BackingStore. |
| 290 # TODO(beng): remove once skia text rendering is on by default. |
| 291 ['use_aura==1 and OS=="win"', { |
| 292 'enable_skia_text%': 1, |
| 293 }], |
| 288 ['use_aura==1 and OS!="win"', { | 294 ['use_aura==1 and OS!="win"', { |
| 289 'toolkit_uses_gtk%': 0, | 295 'toolkit_uses_gtk%': 0, |
| 290 }], | 296 }], |
| 291 | 297 |
| 292 # A flag to enable or disable our compile-time dependency | 298 # A flag to enable or disable our compile-time dependency |
| 293 # on gnome-keyring. If that dependency is disabled, no gnome-keyring | 299 # on gnome-keyring. If that dependency is disabled, no gnome-keyring |
| 294 # support will be available. This option is useful | 300 # support will be available. This option is useful |
| 295 # for Linux distributions and for Aura. | 301 # for Linux distributions and for Aura. |
| 296 ['chromeos==1 or use_aura==1', { | 302 ['chromeos==1 or use_aura==1', { |
| 297 'use_gnome_keyring%': 0, | 303 'use_gnome_keyring%': 0, |
| (...skipping 2290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2588 # settings in target dicts. SYMROOT is a special case, because many other | 2594 # settings in target dicts. SYMROOT is a special case, because many other |
| 2589 # Xcode variables depend on it, including variables such as | 2595 # Xcode variables depend on it, including variables such as |
| 2590 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 2596 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 2591 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 2597 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 2592 # files to appear (when present) in the UI as actual files and not red | 2598 # files to appear (when present) in the UI as actual files and not red |
| 2593 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 2599 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 2594 # and therefore SYMROOT, needs to be set at the project level. | 2600 # and therefore SYMROOT, needs to be set at the project level. |
| 2595 'SYMROOT': '<(DEPTH)/xcodebuild', | 2601 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 2596 }, | 2602 }, |
| 2597 } | 2603 } |
| OLD | NEW |