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

Side by Side Diff: build/common.gypi

Issue 25120002: linux_aura: Turn aura on on the builders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update documentation in nacl.scons about the real bug I filed. Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ppapi/native_client/tests/breakpad_crash_test/nacl.scons » ('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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 # Override branding to select the desired branding flavor. 68 # Override branding to select the desired branding flavor.
69 'branding%': 'Chromium', 69 'branding%': 'Chromium',
70 70
71 'conditions': [ 71 'conditions': [
72 # ChromeOS and Windows use Aura and Ash. 72 # ChromeOS and Windows use Aura and Ash.
73 ['chromeos==1 or OS=="win"', { 73 ['chromeos==1 or OS=="win"', {
74 'use_ash%': 1, 74 'use_ash%': 1,
75 'use_aura%': 1, 75 'use_aura%': 1,
76 }], 76 }],
77 77
78 # ToT Linux should be aura.
79 #
80 # TODO(erg): Merge this into the previous block once compiling with
81 # aura safely implies including ash capabilities.
82 ['OS=="linux"', {
83 'use_aura%': 1,
84 }],
85
78 # For now, Windows builds that |use_aura| should also imply using 86 # For now, Windows builds that |use_aura| should also imply using
79 # ash. This rule should be removed for the future when Windows is 87 # ash. This rule should be removed for the future when Windows is
80 # using the aura windows without the ash interface. 88 # using the aura windows without the ash interface.
81 ['use_aura==1 and OS=="win"', { 89 ['use_aura==1 and OS=="win"', {
82 'use_ash%': 1, 90 'use_ash%': 1,
83 }], 91 }],
84 ['use_ash==1', { 92 ['use_ash==1', {
85 'use_aura%': 1, 93 'use_aura%': 1,
86 }], 94 }],
87 95
(...skipping 4654 matching lines...) Expand 10 before | Expand all | Expand 10 after
4742 # settings in target dicts. SYMROOT is a special case, because many other 4750 # settings in target dicts. SYMROOT is a special case, because many other
4743 # Xcode variables depend on it, including variables such as 4751 # Xcode variables depend on it, including variables such as
4744 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4752 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4745 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4753 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4746 # files to appear (when present) in the UI as actual files and not red 4754 # files to appear (when present) in the UI as actual files and not red
4747 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4755 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4748 # and therefore SYMROOT, needs to be set at the project level. 4756 # and therefore SYMROOT, needs to be set at the project level.
4749 'SYMROOT': '<(DEPTH)/xcodebuild', 4757 'SYMROOT': '<(DEPTH)/xcodebuild',
4750 }, 4758 },
4751 } 4759 }
OLDNEW
« no previous file with comments | « no previous file | ppapi/native_client/tests/breakpad_crash_test/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698