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

Side by Side Diff: build/common.gypi

Issue 25665008: Force use_ash to 0 if use_aura is 0. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 # based on 'buildtype' (i.e. we don't care about saving symbols for 64 # based on 'buildtype' (i.e. we don't care about saving symbols for
65 # non-Official # builds). 65 # non-Official # builds).
66 'buildtype%': 'Dev', 66 'buildtype%': 'Dev',
67 67
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,
scottmg 2013/10/03 19:15:42 i don't think subsequent conditions at the same le
gab 2013/10/03 19:48:35 Ya, I'm also surprised that this works (I just pro
75 'use_aura%': 1, 75 'use_aura%': 1,
76 }], 76 }],
77 77
78 # For now, Windows builds that |use_aura| should also imply using 78 # Ash needs Aura.
79 # ash. This rule should be removed for the future when Windows is 79 ['use_aura==0', {
80 # using the aura windows without the ash interface. 80 'use_ash%': 0,
81 ['use_aura==1 and OS=="win"', {
82 'use_ash%': 1,
83 }],
84 ['use_ash==1', {
85 'use_aura%': 1,
86 }], 81 }],
87 82
88 # Whether we're a traditional desktop unix. 83 # Whether we're a traditional desktop unix.
89 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") a nd chromeos==0', { 84 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") a nd chromeos==0', {
90 'desktop_linux%': 1, 85 'desktop_linux%': 1,
91 }, { 86 }, {
92 'desktop_linux%': 0, 87 'desktop_linux%': 0,
93 }], 88 }],
94 89
95 # Compute the architecture that we're building on. 90 # Compute the architecture that we're building on.
(...skipping 4646 matching lines...) Expand 10 before | Expand all | Expand 10 after
4742 # settings in target dicts. SYMROOT is a special case, because many other 4737 # settings in target dicts. SYMROOT is a special case, because many other
4743 # Xcode variables depend on it, including variables such as 4738 # Xcode variables depend on it, including variables such as
4744 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4739 # 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 4740 # 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 4741 # 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, 4742 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4748 # and therefore SYMROOT, needs to be set at the project level. 4743 # and therefore SYMROOT, needs to be set at the project level.
4749 'SYMROOT': '<(DEPTH)/xcodebuild', 4744 'SYMROOT': '<(DEPTH)/xcodebuild',
4750 }, 4745 },
4751 } 4746 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698