| 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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 'enable_touch_ui%': 1, | 136 'enable_touch_ui%': 1, |
| 137 }], | 137 }], |
| 138 | 138 |
| 139 # Enable App Launcher only on ChromeOS, Windows and OSX. | 139 # Enable App Launcher only on ChromeOS, Windows and OSX. |
| 140 ['use_ash==1 or OS=="win" or OS=="mac"', { | 140 ['use_ash==1 or OS=="win" or OS=="mac"', { |
| 141 'enable_app_list%': 1, | 141 'enable_app_list%': 1, |
| 142 }, { | 142 }, { |
| 143 'enable_app_list%': 0, | 143 'enable_app_list%': 0, |
| 144 }], | 144 }], |
| 145 | 145 |
| 146 # Enable Message Center only on ChromeOS and Windows for now. | 146 # Enable Message Center only on ChromeOS, Windows, and Mac for now. |
| 147 ['use_ash==1 or OS=="win"', { | 147 ['use_ash==1 or OS=="win" or OS=="mac"', { |
| 148 'enable_message_center%': 1, | 148 'enable_message_center%': 1, |
| 149 }, { | 149 }, { |
| 150 'enable_message_center%': 0, | 150 'enable_message_center%': 0, |
| 151 }], | 151 }], |
| 152 | 152 |
| 153 ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro
id")', { | 153 ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro
id")', { |
| 154 'use_default_render_theme%': 1, | 154 'use_default_render_theme%': 1, |
| 155 }, { | 155 }, { |
| 156 'use_default_render_theme%': 0, | 156 'use_default_render_theme%': 0, |
| 157 }], | 157 }], |
| (...skipping 3999 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4157 # settings in target dicts. SYMROOT is a special case, because many other | 4157 # settings in target dicts. SYMROOT is a special case, because many other |
| 4158 # Xcode variables depend on it, including variables such as | 4158 # Xcode variables depend on it, including variables such as |
| 4159 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4159 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4160 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4160 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4161 # files to appear (when present) in the UI as actual files and not red | 4161 # files to appear (when present) in the UI as actual files and not red |
| 4162 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4162 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4163 # and therefore SYMROOT, needs to be set at the project level. | 4163 # and therefore SYMROOT, needs to be set at the project level. |
| 4164 'SYMROOT': '<(DEPTH)/xcodebuild', | 4164 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4165 }, | 4165 }, |
| 4166 } | 4166 } |
| OLD | NEW |