| 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 637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 648 'enable_captive_portal_detection%': 0, | 648 'enable_captive_portal_detection%': 0, |
| 649 }, { | 649 }, { |
| 650 'enable_captive_portal_detection%': 1, | 650 'enable_captive_portal_detection%': 1, |
| 651 }], | 651 }], |
| 652 | 652 |
| 653 # Enable Skia UI text drawing incrementally on different platforms. | 653 # Enable Skia UI text drawing incrementally on different platforms. |
| 654 # http://crbug.com/105550 | 654 # http://crbug.com/105550 |
| 655 # | 655 # |
| 656 # On Aura, this allows per-tile painting to be used in the browser | 656 # On Aura, this allows per-tile painting to be used in the browser |
| 657 # compositor. | 657 # compositor. |
| 658 ['OS!="mac" and OS!="android"', { | 658 ['OS!="android"', { |
| 659 'use_canvas_skia%': 1, | 659 'use_canvas_skia%': 1, |
| 660 }], | 660 }], |
| 661 | 661 |
| 662 ['chromeos==1', { | 662 ['chromeos==1', { |
| 663 # When building for ChromeOS we dont want Chromium to use libjpeg_turb
o. | 663 # When building for ChromeOS we dont want Chromium to use libjpeg_turb
o. |
| 664 'use_libjpeg_turbo%': 0, | 664 'use_libjpeg_turbo%': 0, |
| 665 }], | 665 }], |
| 666 | 666 |
| 667 ['OS=="android"', { | 667 ['OS=="android"', { |
| 668 # When building as part of the Android system, use system libraries | 668 # When building as part of the Android system, use system libraries |
| (...skipping 4056 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4725 # settings in target dicts. SYMROOT is a special case, because many other | 4725 # settings in target dicts. SYMROOT is a special case, because many other |
| 4726 # Xcode variables depend on it, including variables such as | 4726 # Xcode variables depend on it, including variables such as |
| 4727 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4727 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4728 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4728 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4729 # files to appear (when present) in the UI as actual files and not red | 4729 # files to appear (when present) in the UI as actual files and not red |
| 4730 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4730 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4731 # and therefore SYMROOT, needs to be set at the project level. | 4731 # and therefore SYMROOT, needs to be set at the project level. |
| 4732 'SYMROOT': '<(DEPTH)/xcodebuild', | 4732 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4733 }, | 4733 }, |
| 4734 } | 4734 } |
| OLD | NEW |