| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 # Override branding to select the desired branding flavor. | 68 # Override branding to select the desired branding flavor. |
| 69 'branding%': 'Chromium', | 69 'branding%': 'Chromium', |
| 70 | 70 |
| 71 'conditions': [ | 71 'conditions': [ |
| 72 # ChromeOS and Windows use Aura and Ash. | 72 # ChromeOS and Windows use Aura and Ash. |
| 73 ['chromeos==1 or OS=="win"', { | 73 ['chromeos==1 or OS=="win"', { |
| 74 'use_ash%': 1, | 74 'use_ash%': 1, |
| 75 'use_aura%': 1, | 75 'use_aura%': 1, |
| 76 }], | 76 }], |
| 77 | 77 |
| 78 # ToT Linux should be aura. | |
| 79 # | |
| 80 # TODO(erg): Merge this into the previous block once compiling with | |
| 81 # aura safely implies including ash capabilities. | |
| 82 ['OS=="linux"', { | |
| 83 'use_aura%': 1, | |
| 84 }], | |
| 85 | |
| 86 # Whether we're a traditional desktop unix. | 78 # Whether we're a traditional desktop unix. |
| 87 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") a
nd chromeos==0', { | 79 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") a
nd chromeos==0', { |
| 88 'desktop_linux%': 1, | 80 'desktop_linux%': 1, |
| 89 }, { | 81 }, { |
| 90 'desktop_linux%': 0, | 82 'desktop_linux%': 0, |
| 91 }], | 83 }], |
| 92 | 84 |
| 93 # Compute the architecture that we're building on. | 85 # Compute the architecture that we're building on. |
| 94 ['OS=="win" or OS=="mac" or OS=="ios"', { | 86 ['OS=="win" or OS=="mac" or OS=="ios"', { |
| 95 'host_arch%': 'ia32', | 87 'host_arch%': 'ia32', |
| (...skipping 4656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4752 # settings in target dicts. SYMROOT is a special case, because many other | 4744 # settings in target dicts. SYMROOT is a special case, because many other |
| 4753 # Xcode variables depend on it, including variables such as | 4745 # Xcode variables depend on it, including variables such as |
| 4754 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4746 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4755 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4747 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4756 # files to appear (when present) in the UI as actual files and not red | 4748 # files to appear (when present) in the UI as actual files and not red |
| 4757 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4749 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4758 # and therefore SYMROOT, needs to be set at the project level. | 4750 # and therefore SYMROOT, needs to be set at the project level. |
| 4759 'SYMROOT': '<(DEPTH)/xcodebuild', | 4751 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4760 }, | 4752 }, |
| 4761 } | 4753 } |
| OLD | NEW |