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

Side by Side Diff: build/common.gypi

Issue 659233002: STASH: Epic Experimental patch for toolkit-views App List on Mac Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Fix a few things. Works@master Created 6 years, 2 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 | « base/threading/thread_restrictions.cc ('k') | chrome/browser/app_controller_mac.mm » ('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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 # below for MIPS targets. 180 # below for MIPS targets.
181 'mips_arch_variant%': '', 181 'mips_arch_variant%': '',
182 182
183 'conditions': [ 183 'conditions': [
184 # Ash needs Aura. 184 # Ash needs Aura.
185 ['use_aura==0', { 185 ['use_aura==0', {
186 'use_ash%': 0, 186 'use_ash%': 0,
187 }], 187 }],
188 188
189 # Set default value of toolkit_views based on OS. 189 # Set default value of toolkit_views based on OS.
190 ['OS=="win" or chromeos==1 or use_aura==1', { 190 ['OS=="win" or OS=="mac" or chromeos==1 or use_aura==1', {
191 'toolkit_views%': 1, 191 'toolkit_views%': 1,
192 }, { 192 }, {
193 'toolkit_views%': 0, 193 'toolkit_views%': 0,
194 }], 194 }],
195 195
196 # Embedded builds use aura without ash or views. 196 # Embedded builds use aura without ash or views.
197 ['embedded==1', { 197 ['embedded==1', {
198 'use_aura%': 1, 198 'use_aura%': 1,
199 'use_ash%': 0, 199 'use_ash%': 0,
200 'toolkit_views%': 0, 200 'toolkit_views%': 0,
(...skipping 5549 matching lines...) Expand 10 before | Expand all | Expand 10 after
5750 # settings in target dicts. SYMROOT is a special case, because many other 5750 # settings in target dicts. SYMROOT is a special case, because many other
5751 # Xcode variables depend on it, including variables such as 5751 # Xcode variables depend on it, including variables such as
5752 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5752 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5753 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5753 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5754 # files to appear (when present) in the UI as actual files and not red 5754 # files to appear (when present) in the UI as actual files and not red
5755 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5755 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5756 # and therefore SYMROOT, needs to be set at the project level. 5756 # and therefore SYMROOT, needs to be set at the project level.
5757 'SYMROOT': '<(DEPTH)/xcodebuild', 5757 'SYMROOT': '<(DEPTH)/xcodebuild',
5758 }, 5758 },
5759 } 5759 }
OLDNEW
« no previous file with comments | « base/threading/thread_restrictions.cc ('k') | chrome/browser/app_controller_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698