| 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 }], | 136 }], |
| 137 | 137 |
| 138 # Enable App Launcher only on ChromeOS and Windows for now. | 138 # Enable App Launcher only on ChromeOS and Windows for now. |
| 139 ['use_ash==1 or OS=="win"', { | 139 ['use_ash==1 or OS=="win"', { |
| 140 'enable_app_list%': 1, | 140 'enable_app_list%': 1, |
| 141 }, { | 141 }, { |
| 142 'enable_app_list%': 0, | 142 'enable_app_list%': 0, |
| 143 }], | 143 }], |
| 144 | 144 |
| 145 ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro
id")', { | 145 ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro
id")', { |
| 146 # TODO(sky): make this 1 when corresponding webkit pieces land. | 146 'use_default_render_theme%': 1, |
| 147 'use_default_render_theme%': 0, | |
| 148 }, { | 147 }, { |
| 149 'use_default_render_theme%': 0, | 148 'use_default_render_theme%': 0, |
| 150 }], | 149 }], |
| 151 ], | 150 ], |
| 152 }, | 151 }, |
| 153 | 152 |
| 154 # Copy conditionally-set variables out one scope. | 153 # Copy conditionally-set variables out one scope. |
| 155 'chromeos%': '<(chromeos)', | 154 'chromeos%': '<(chromeos)', |
| 156 'host_arch%': '<(host_arch)', | 155 'host_arch%': '<(host_arch)', |
| 157 'toolkit_views%': '<(toolkit_views)', | 156 'toolkit_views%': '<(toolkit_views)', |
| (...skipping 3723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3881 # settings in target dicts. SYMROOT is a special case, because many other | 3880 # settings in target dicts. SYMROOT is a special case, because many other |
| 3882 # Xcode variables depend on it, including variables such as | 3881 # Xcode variables depend on it, including variables such as |
| 3883 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3882 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3884 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3883 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3885 # files to appear (when present) in the UI as actual files and not red | 3884 # files to appear (when present) in the UI as actual files and not red |
| 3886 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3885 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3887 # and therefore SYMROOT, needs to be set at the project level. | 3886 # and therefore SYMROOT, needs to be set at the project level. |
| 3888 'SYMROOT': '<(DEPTH)/xcodebuild', | 3887 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3889 }, | 3888 }, |
| 3890 } | 3889 } |
| OLD | NEW |