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

Side by Side Diff: build/common.gypi

Issue 25108005: linux_aura: Compile ash into chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chromeos link 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
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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 # For now, Windows builds that |use_aura| should also imply using 78 # For now, Windows builds that |use_aura| should also imply using
79 # ash. This rule should be removed for the future when Windows is 79 # ash. This rule should be removed for the future when Windows is
80 # using the aura windows without the ash interface. 80 # using the aura windows without the ash interface.
81 ['use_aura==1 and OS=="win"', { 81 ['use_aura==1 and (OS=="win" or OS=="linux")', {
82 'use_ash%': 1, 82 'use_ash%': 1,
83 }], 83 }],
84 ['use_ash==1', { 84 ['use_ash==1', {
85 'use_aura%': 1, 85 'use_aura%': 1,
86 }], 86 }],
87 87
88 # Compute the architecture that we're building on. 88 # Compute the architecture that we're building on.
89 ['OS=="win" or OS=="mac" or OS=="ios"', { 89 ['OS=="win" or OS=="mac" or OS=="ios"', {
90 'host_arch%': 'ia32', 90 'host_arch%': 'ia32',
91 }, { 91 }, {
(...skipping 4640 matching lines...) Expand 10 before | Expand all | Expand 10 after
4732 # settings in target dicts. SYMROOT is a special case, because many other 4732 # settings in target dicts. SYMROOT is a special case, because many other
4733 # Xcode variables depend on it, including variables such as 4733 # Xcode variables depend on it, including variables such as
4734 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4734 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4735 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4735 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4736 # files to appear (when present) in the UI as actual files and not red 4736 # files to appear (when present) in the UI as actual files and not red
4737 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4737 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4738 # and therefore SYMROOT, needs to be set at the project level. 4738 # and therefore SYMROOT, needs to be set at the project level.
4739 'SYMROOT': '<(DEPTH)/xcodebuild', 4739 'SYMROOT': '<(DEPTH)/xcodebuild',
4740 }, 4740 },
4741 } 4741 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698