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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
153 # Enable HiDPI on Mac OS and Chrome OS. | 153 # Enable HiDPI on Mac OS and Chrome OS. |
154 ['OS=="mac" or chromeos==1', { | 154 ['OS=="mac" or chromeos==1', { |
155 'enable_hidpi%': 1, | 155 'enable_hidpi%': 1, |
156 }], | 156 }], |
157 | 157 |
158 # Enable touch UI on Metro. | 158 # Enable touch UI on Metro. |
159 ['OS=="win"', { | 159 ['OS=="win"', { |
160 'enable_touch_ui%': 1, | 160 'enable_touch_ui%': 1, |
161 }], | 161 }], |
162 | 162 |
163 # Enable App Launcher only on ChromeOS, Windows and OSX. | 163 # Enable App Launcher on ChromeOS, Windows and OSX. |
164 ['use_ash==1 or OS=="win" or OS=="mac"', { | 164 # On Linux, enable App Launcher for the Aura build. |
165 ['use_ash==1 or OS=="win" or OS=="mac" or ((OS=="linux" or OS=="freebs d" or OS=="openbsd" or OS=="solaris") and use_aura==1)', { | |
tapted
2013/09/26 23:51:18
The minimal change for this might be simply to cha
Matt Giuca
2013/09/27 05:57:40
This doesn't seem quite right, as discussed: Aura
| |
165 'enable_app_list%': 1, | 166 'enable_app_list%': 1, |
166 }, { | 167 }, { |
167 'enable_app_list%': 0, | 168 'enable_app_list%': 0, |
168 }], | 169 }], |
169 | 170 |
170 ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro id")', { | 171 ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro id")', { |
171 'use_default_render_theme%': 1, | 172 'use_default_render_theme%': 1, |
172 }, { | 173 }, { |
173 'use_default_render_theme%': 0, | 174 'use_default_render_theme%': 0, |
174 }], | 175 }], |
(...skipping 4557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4732 # settings in target dicts. SYMROOT is a special case, because many other | 4733 # settings in target dicts. SYMROOT is a special case, because many other |
4733 # Xcode variables depend on it, including variables such as | 4734 # Xcode variables depend on it, including variables such as |
4734 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4735 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
4735 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4736 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
4736 # files to appear (when present) in the UI as actual files and not red | 4737 # files to appear (when present) in the UI as actual files and not red |
4737 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4738 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
4738 # and therefore SYMROOT, needs to be set at the project level. | 4739 # and therefore SYMROOT, needs to be set at the project level. |
4739 'SYMROOT': '<(DEPTH)/xcodebuild', | 4740 'SYMROOT': '<(DEPTH)/xcodebuild', |
4740 }, | 4741 }, |
4741 } | 4742 } |
OLD | NEW |