Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(350)

Side by Side Diff: build/common.gypi

Issue 984513002: Enable toolkit_views=1 by default on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to MASTER :o Also update ui.gni Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | build/config/ui.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 # 2: revision 2 190 # 2: revision 2
191 'mips_dsp_rev%': 0, 191 'mips_dsp_rev%': 0,
192 192
193 'conditions': [ 193 'conditions': [
194 # Ash needs Aura. 194 # Ash needs Aura.
195 ['use_aura==0', { 195 ['use_aura==0', {
196 'use_ash%': 0, 196 'use_ash%': 0,
197 }], 197 }],
198 198
199 # Set default value of toolkit_views based on OS. 199 # Set default value of toolkit_views based on OS.
200 ['OS=="win" or chromeos==1 or use_aura==1', { 200 ['OS=="mac" or OS=="win" or chromeos==1 or use_aura==1', {
201 'toolkit_views%': 1, 201 'toolkit_views%': 1,
202 }, { 202 }, {
203 'toolkit_views%': 0, 203 'toolkit_views%': 0,
204 }], 204 }],
205 205
206 # Embedded builds use aura without ash or views. 206 # Embedded builds use aura without ash or views.
207 ['embedded==1', { 207 ['embedded==1', {
208 'use_aura%': 1, 208 'use_aura%': 1,
209 'use_ash%': 0, 209 'use_ash%': 0,
210 'toolkit_views%': 0, 210 'toolkit_views%': 0,
(...skipping 5816 matching lines...) Expand 10 before | Expand all | Expand 10 after
6027 # settings in target dicts. SYMROOT is a special case, because many other 6027 # settings in target dicts. SYMROOT is a special case, because many other
6028 # Xcode variables depend on it, including variables such as 6028 # Xcode variables depend on it, including variables such as
6029 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6029 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6030 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6030 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6031 # files to appear (when present) in the UI as actual files and not red 6031 # files to appear (when present) in the UI as actual files and not red
6032 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6032 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6033 # and therefore SYMROOT, needs to be set at the project level. 6033 # and therefore SYMROOT, needs to be set at the project level.
6034 'SYMROOT': '<(DEPTH)/xcodebuild', 6034 'SYMROOT': '<(DEPTH)/xcodebuild',
6035 }, 6035 },
6036 } 6036 }
OLDNEW
« no previous file with comments | « no previous file | build/config/ui.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698