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

Side by Side Diff: build/common.gypi

Issue 10389217: Aura: Desktop aura is now default on non-chromeos linux builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | « build/all.gyp ('k') | chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc » ('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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 # Chromeos implies ash. 91 # Chromeos implies ash.
92 ['chromeos==1', { 92 ['chromeos==1', {
93 'use_ash%': 1, 93 'use_ash%': 1,
94 'use_aura%': 1, 94 'use_aura%': 1,
95 }], 95 }],
96 96
97 # For now, Windows *AND* Linux builds that |use_aura| should also 97 # For now, Windows *AND* Linux builds that |use_aura| should also
98 # imply using ash. This rule should be removed for the future when 98 # imply using ash. This rule should be removed for the future when
99 # both Linux and Windows are using the aura windows without the ash 99 # both Linux and Windows are using the aura windows without the ash
100 # interface. 100 # interface.
101 ['use_aura==1 and ((OS=="linux" and chromeos==0) or OS=="win")', { 101 ['use_aura==1 and OS=="win"', {
102 'use_ash%': 1, 102 'use_ash%': 1,
103 }], 103 }],
104 ['use_ash==1', { 104 ['use_ash==1', {
105 'use_aura%': 1, 105 'use_aura%': 1,
106 }], 106 }],
107 107
108 # Set default value of toolkit_views based on OS. 108 # Set default value of toolkit_views based on OS.
109 ['OS=="win" or chromeos==1 or use_aura==1', { 109 ['OS=="win" or chromeos==1 or use_aura==1', {
110 'toolkit_views%': 1, 110 'toolkit_views%': 1,
111 }, { 111 }, {
(...skipping 2985 matching lines...) Expand 10 before | Expand all | Expand 10 after
3097 # settings in target dicts. SYMROOT is a special case, because many other 3097 # settings in target dicts. SYMROOT is a special case, because many other
3098 # Xcode variables depend on it, including variables such as 3098 # Xcode variables depend on it, including variables such as
3099 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3099 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3100 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3100 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3101 # files to appear (when present) in the UI as actual files and not red 3101 # files to appear (when present) in the UI as actual files and not red
3102 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3102 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3103 # and therefore SYMROOT, needs to be set at the project level. 3103 # and therefore SYMROOT, needs to be set at the project level.
3104 'SYMROOT': '<(DEPTH)/xcodebuild', 3104 'SYMROOT': '<(DEPTH)/xcodebuild',
3105 }, 3105 },
3106 } 3106 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698