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

Side by Side Diff: build/common.gypi

Issue 9570065: chromeos: Turn on ash only when building non-gtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 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/chrome_browser.gypi » ('j') | chrome/chrome_browser.gypi » ('J')
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 'host_arch%': 'ia32', 65 'host_arch%': 'ia32',
66 }, { 66 }, {
67 # This handles the Unix platforms for which there is some support. 67 # This handles the Unix platforms for which there is some support.
68 # Anything else gets passed through, which probably won't work very 68 # Anything else gets passed through, which probably won't work very
69 # well; such hosts should pass an explicit target_arch to gyp. 69 # well; such hosts should pass an explicit target_arch to gyp.
70 'host_arch%': 70 'host_arch%':
71 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")', 71 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")',
72 }], 72 }],
73 73
74 # Non-GTK Chromeos implies ash. 74 # Non-GTK Chromeos implies ash.
75 ['chromeos==1', { 75 ['chromeos==1 and chromeos_gtk==0', {
76 'use_ash%': 1, 76 'use_ash%': 1,
77 'use_aura%': 1, 77 'use_aura%': 1,
78 }], 78 }],
79 79
80 # For now, Windows *AND* Linux builds that |use_aura| should also 80 # For now, Windows *AND* Linux builds that |use_aura| should also
81 # imply using ash. This rule should be removed for the future when 81 # imply using ash. This rule should be removed for the future when
82 # both Linux and Windows are using the aura windows without the ash 82 # both Linux and Windows are using the aura windows without the ash
83 # interface. 83 # interface.
84 ['use_aura==1 and ((OS=="linux" and chromeos==0) or OS=="win")', { 84 ['use_aura==1 and ((OS=="linux" and chromeos==0) or OS=="win")', {
85 'use_ash%': 1, 85 'use_ash%': 1,
(...skipping 2789 matching lines...) Expand 10 before | Expand all | Expand 10 after
2875 # settings in target dicts. SYMROOT is a special case, because many other 2875 # settings in target dicts. SYMROOT is a special case, because many other
2876 # Xcode variables depend on it, including variables such as 2876 # Xcode variables depend on it, including variables such as
2877 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2877 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2878 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2878 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2879 # files to appear (when present) in the UI as actual files and not red 2879 # files to appear (when present) in the UI as actual files and not red
2880 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2880 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2881 # and therefore SYMROOT, needs to be set at the project level. 2881 # and therefore SYMROOT, needs to be set at the project level.
2882 'SYMROOT': '<(DEPTH)/xcodebuild', 2882 'SYMROOT': '<(DEPTH)/xcodebuild',
2883 }, 2883 },
2884 } 2884 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_browser.gypi » ('j') | chrome/chrome_browser.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698