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

Side by Side Diff: build/common.gypi

Issue 166443007: Revert 245737 "Reenable linux_aura on the main builders. (Again)." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1847/src/
Patch Set: Created 6 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/installer/linux/debian/expected_deps » ('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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 ['chromeos==1 or OS=="win"', { 74 ['chromeos==1 or OS=="win"', {
75 'use_ash%': 1, 75 'use_ash%': 1,
76 'use_aura%': 1, 76 'use_aura%': 1,
77 }], 77 }],
78 78
79 # Ozone uses Aura. 79 # Ozone uses Aura.
80 ['use_ozone==1', { 80 ['use_ozone==1', {
81 'use_aura%': 1, 81 'use_aura%': 1,
82 }], 82 }],
83 83
84 # ToT Linux should be aura.
85 #
86 # TODO(erg): Merge this into the previous block once compiling with
87 # aura safely implies including ash capabilities.
88 ['OS=="linux"', {
89 'use_aura%': 1,
90 }],
91
92 # Whether we're a traditional desktop unix. 84 # Whether we're a traditional desktop unix.
93 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") a nd chromeos==0', { 85 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") a nd chromeos==0', {
94 'desktop_linux%': 1, 86 'desktop_linux%': 1,
95 }, { 87 }, {
96 'desktop_linux%': 0, 88 'desktop_linux%': 0,
97 }], 89 }],
98 90
99 # Compute the architecture that we're building on. 91 # Compute the architecture that we're building on.
100 ['OS=="win" or OS=="mac" or OS=="ios"', { 92 ['OS=="win" or OS=="mac" or OS=="ios"', {
101 'host_arch%': 'ia32', 93 'host_arch%': 'ia32',
(...skipping 4893 matching lines...) Expand 10 before | Expand all | Expand 10 after
4995 # settings in target dicts. SYMROOT is a special case, because many other 4987 # settings in target dicts. SYMROOT is a special case, because many other
4996 # Xcode variables depend on it, including variables such as 4988 # Xcode variables depend on it, including variables such as
4997 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4989 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4998 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4990 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4999 # files to appear (when present) in the UI as actual files and not red 4991 # files to appear (when present) in the UI as actual files and not red
5000 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4992 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5001 # and therefore SYMROOT, needs to be set at the project level. 4993 # and therefore SYMROOT, needs to be set at the project level.
5002 'SYMROOT': '<(DEPTH)/xcodebuild', 4994 'SYMROOT': '<(DEPTH)/xcodebuild',
5003 }, 4995 },
5004 } 4996 }
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/linux/debian/expected_deps » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698