| 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 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 628 'enable_captive_portal_detection%': 0, | 628 'enable_captive_portal_detection%': 0, |
| 629 }, { | 629 }, { |
| 630 'enable_captive_portal_detection%': 1, | 630 'enable_captive_portal_detection%': 1, |
| 631 }], | 631 }], |
| 632 | 632 |
| 633 # Enable Skia UI text drawing incrementally on different platforms. | 633 # Enable Skia UI text drawing incrementally on different platforms. |
| 634 # http://crbug.com/105550 | 634 # http://crbug.com/105550 |
| 635 # | 635 # |
| 636 # On Aura, this allows per-tile painting to be used in the browser | 636 # On Aura, this allows per-tile painting to be used in the browser |
| 637 # compositor. | 637 # compositor. |
| 638 ['OS!="mac" and OS!="android"', { | 638 ['OS!="android"', { |
| 639 'use_canvas_skia%': 1, | 639 'use_canvas_skia%': 1, |
| 640 }], | 640 }], |
| 641 | 641 |
| 642 ['chromeos==1', { | 642 ['chromeos==1', { |
| 643 # When building for ChromeOS we dont want Chromium to use libjpeg_turb
o. | 643 # When building for ChromeOS we dont want Chromium to use libjpeg_turb
o. |
| 644 'use_libjpeg_turbo%': 0, | 644 'use_libjpeg_turbo%': 0, |
| 645 }], | 645 }], |
| 646 | 646 |
| 647 ['OS=="android"', { | 647 ['OS=="android"', { |
| 648 # When building as part of the Android system, use system libraries | 648 # When building as part of the Android system, use system libraries |
| (...skipping 4056 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4705 # settings in target dicts. SYMROOT is a special case, because many other | 4705 # settings in target dicts. SYMROOT is a special case, because many other |
| 4706 # Xcode variables depend on it, including variables such as | 4706 # Xcode variables depend on it, including variables such as |
| 4707 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4707 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4708 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4708 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4709 # files to appear (when present) in the UI as actual files and not red | 4709 # files to appear (when present) in the UI as actual files and not red |
| 4710 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4710 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4711 # and therefore SYMROOT, needs to be set at the project level. | 4711 # and therefore SYMROOT, needs to be set at the project level. |
| 4712 'SYMROOT': '<(DEPTH)/xcodebuild', | 4712 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4713 }, | 4713 }, |
| 4714 } | 4714 } |
| OLD | NEW |