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

Side by Side Diff: build/common.gypi

Issue 12225037: Turn on aura again to get performance numbers. Will revert once perf release (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/test/ui/ui_test.cc » ('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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 # non-Official # builds). 57 # non-Official # builds).
58 'buildtype%': 'Dev', 58 'buildtype%': 'Dev',
59 59
60 'conditions': [ 60 'conditions': [
61 # ChromeOS implies ash. 61 # ChromeOS implies ash.
62 ['chromeos==1', { 62 ['chromeos==1', {
63 'use_ash%': 1, 63 'use_ash%': 1,
64 'use_aura%': 1, 64 'use_aura%': 1,
65 }], 65 }],
66 66
67 # For now, Windows builds that |use_aura| should also imply using 67 # Temporarily turn on aura for windows to get perf numbers. Will
68 # ash. This rule should be removed for the future when Windows is 68 # revert ASAP.
69 # using the aura windows without the ash interface. 69 ['OS=="win"', {
70 ['use_aura==1 and OS=="win"', {
71 'use_ash%': 1, 70 'use_ash%': 1,
71 'use_aura%': 1,
72 }], 72 }],
73 ['use_ash==1', { 73 ['use_ash==1', {
74 'use_aura%': 1, 74 'use_aura%': 1,
75 }], 75 }],
76 76
77 # Compute the architecture that we're building on. 77 # Compute the architecture that we're building on.
78 ['OS=="win" or OS=="mac" or OS=="ios"', { 78 ['OS=="win" or OS=="mac" or OS=="ios"', {
79 'host_arch%': 'ia32', 79 'host_arch%': 'ia32',
80 }, { 80 }, {
81 # This handles the Unix platforms for which there is some support. 81 # This handles the Unix platforms for which there is some support.
(...skipping 3944 matching lines...) Expand 10 before | Expand all | Expand 10 after
4026 # settings in target dicts. SYMROOT is a special case, because many other 4026 # settings in target dicts. SYMROOT is a special case, because many other
4027 # Xcode variables depend on it, including variables such as 4027 # Xcode variables depend on it, including variables such as
4028 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4028 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4029 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4029 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4030 # files to appear (when present) in the UI as actual files and not red 4030 # files to appear (when present) in the UI as actual files and not red
4031 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4031 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4032 # and therefore SYMROOT, needs to be set at the project level. 4032 # and therefore SYMROOT, needs to be set at the project level.
4033 'SYMROOT': '<(DEPTH)/xcodebuild', 4033 'SYMROOT': '<(DEPTH)/xcodebuild',
4034 }, 4034 },
4035 } 4035 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/ui/ui_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698