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

Side by Side Diff: build/common.gypi

Issue 7780012: First step into enabling pure views build for Chromium/ChromiumOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing comma in comment Created 9 years, 3 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 | views/widget/widget.cc » ('j') | views/widget/widget.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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.
11 'variables': { 11 'variables': {
12 # Putting a variables dict inside another variables dict looks kind of 12 # Putting a variables dict inside another variables dict looks kind of
13 # weird. This is done so that 'host_arch', 'chromeos', etc are defined as 13 # weird. This is done so that 'host_arch', 'chromeos', etc are defined as
14 # variables within the outer variables dict here. This is necessary 14 # variables within the outer variables dict here. This is necessary
15 # to get these variables defined for the conditions within this variables 15 # to get these variables defined for the conditions within this variables
16 # dict that operate on these variables (e.g., for setting 'toolkit_views', 16 # dict that operate on these variables (e.g., for setting 'toolkit_views',
17 # we need to have 'chromeos' already set). 17 # we need to have 'chromeos' already set).
18 'variables': { 18 'variables': {
19 'variables': { 19 'variables': {
20 'variables': { 20 'variables': {
21 # Whether we're building a ChromeOS build. 21 # Whether we're building a ChromeOS build.
22 'chromeos%': 0, 22 'chromeos%': 0,
23 23
24 # Whether the Views toolkit can use its Pure form when available 24 # Whether the Views toolkit can use its Pure form when available
25 # or if it must only use GTK (the default at the moment). 25 # or if it must only use GTK (the default at the moment).
26 # This is an intermediate step until all of Views is 'Pure', 26 # This is an intermediate step until all of Views is 'Pure',
27 # at which point we plan to remove those switches. 27 # at which point we plan to remove those switches.
28 # This turns on the TOOLKIT_USES_PURE_VIEWS macro which is used 28 # This turns on the TOOLKIT_USES_PURE_VIEWS macro.
29 # to replace the corresponding GTK implementation in such a way
30 # that GTK and PureViews can coexist. This intermediate solution
31 # allow us to switch the view implementations using
32 # --use-pure-views, without breaking exiting gtk implementation.
33 'toolkit_uses_pure_views%': 0, 29 'toolkit_uses_pure_views%': 0,
34 30
35 # Disable touch support by default. 31 # Disable touch support by default.
36 'touchui%': 0, 32 'touchui%': 0,
37 33
38 # Disable webui dialog replacements for native dialogs by default. 34 # Disable webui dialog replacements for native dialogs by default.
39 # TODO(flackr): Change this to a runtime flag triggered by 35 # TODO(flackr): Change this to a runtime flag triggered by
40 # --pure-views so that these dialogs can be easily tested. 36 # --pure-views so that these dialogs can be easily tested.
41 'webui_dialogs%': 0, 37 'webui_dialogs%': 0,
42 38
(...skipping 16 matching lines...) Expand all
59 [ 'OS=="win" or OS=="mac"', { 55 [ 'OS=="win" or OS=="mac"', {
60 'host_arch%': 'ia32', 56 'host_arch%': 'ia32',
61 }, { 57 }, {
62 # This handles the Unix platforms for which there is some support. 58 # This handles the Unix platforms for which there is some support.
63 # Anything else gets passed through, which probably won't work very 59 # Anything else gets passed through, which probably won't work very
64 # well; such hosts should pass an explicit target_arch to gyp. 60 # well; such hosts should pass an explicit target_arch to gyp.
65 'host_arch%': 61 'host_arch%':
66 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")', 62 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")',
67 }], 63 }],
68 64
69 # Set default value of toolkit_views on for Windows, Chrome OS 65 # Set default value of toolkit_views on for Windows, Chrome OS,
70 # and the touch UI. 66 # Touch and PureView.
71 ['OS=="win" or chromeos==1 or touchui==1 or toolkit_uses_pure_views==1 ', { 67 ['OS=="win" or chromeos==1 or touchui==1 or toolkit_uses_pure_views==1 ', {
72 'toolkit_views%': 1, 68 'toolkit_views%': 1,
73 }, { 69 }, {
74 'toolkit_views%': 0, 70 'toolkit_views%': 0,
75 }], 71 }],
76 72
77 # Views are always Pure in Touch case 73 # Views are always Pure in Touch case.
78 ['touchui==1', { 74 ['touchui==1', {
79 'toolkit_uses_pure_views%': 1, 75 'toolkit_uses_pure_views%': 1,
80 }, { 76 }, {
81 'toolkit_uses_pure_views%': 0, 77 'toolkit_uses_pure_views%': 0,
82 }], 78 }],
83 79
84 # Use WebUI dialogs in TouchUI builds. 80 # Use WebUI dialogs in TouchUI and PureView builds.
85 ['touchui==1', { 81 ['touchui==1 or toolkit_uses_pure_views==1', {
86 'webui_dialogs%': 1, 82 'webui_dialogs%': 1,
oshima 2011/09/10 02:04:19 just a q: do you know when we'll make this a flag?
Emmanuel Saint-loubert-Bié 2011/09/10 03:06:31 I assume when rbyers / flackr are further along?
87 }], 83 }],
88 84
89 # Use the views compositor when using the Aura window manager. 85 # Use the views compositor when using the Aura window manager.
90 ['use_aura==1', { 86 ['use_aura==1', {
91 'views_compositor%': 1, 87 'views_compositor%': 1,
92 }], 88 }],
93 ], 89 ],
94 }, 90 },
95 91
96 # Copy conditionally-set variables out one scope. 92 # Copy conditionally-set variables out one scope.
97 'chromeos%': '<(chromeos)', 93 'chromeos%': '<(chromeos)',
98 'touchui%': '<(touchui)', 94 'touchui%': '<(touchui)',
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 }, { 258 }, {
263 'enable_flapper_hacks%': 0, 259 'enable_flapper_hacks%': 0,
264 }], 260 }],
265 261
266 # Enable file manager extension by default on Chrome OS. 262 # Enable file manager extension by default on Chrome OS.
267 ['chromeos==1', { 263 ['chromeos==1', {
268 'file_manager_extension%': 1, 264 'file_manager_extension%': 1,
269 }, { 265 }, {
270 'file_manager_extension%': 0, 266 'file_manager_extension%': 0,
271 }], 267 }],
272 268
273 # Enable WebUI TaskManager only on Chrome OS and Touch UI. 269 # Enable WebUI TaskManager only on Chrome OS, Touch or PureView.
274 ['chromeos==1 or touchui==1', { 270 ['chromeos==1 or touchui==1 or toolkit_uses_pure_views==1', {
275 'webui_task_manager%': 1, 271 'webui_task_manager%': 1,
276 }, { 272 }, {
277 'webui_task_manager%': 0, 273 'webui_task_manager%': 0,
278 }], 274 }],
279 275
280 # Enable smooth scrolling for Mac, Win, Linux and ChromeOS 276 # Enable smooth scrolling for Mac, Win, Linux and ChromeOS
281 ['OS=="linux" or OS=="mac" or OS=="win"', { 277 ['OS=="linux" or OS=="mac" or OS=="win"', {
282 'enable_smooth_scrolling%': 1, 278 'enable_smooth_scrolling%': 1,
283 }, { 279 }, {
284 'enable_smooth_scrolling%': 0, 280 'enable_smooth_scrolling%': 0,
(...skipping 1767 matching lines...) Expand 10 before | Expand all | Expand 10 after
2052 # settings in target dicts. SYMROOT is a special case, because many other 2048 # settings in target dicts. SYMROOT is a special case, because many other
2053 # Xcode variables depend on it, including variables such as 2049 # Xcode variables depend on it, including variables such as
2054 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2050 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2055 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2051 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2056 # files to appear (when present) in the UI as actual files and not red 2052 # files to appear (when present) in the UI as actual files and not red
2057 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2053 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2058 # and therefore SYMROOT, needs to be set at the project level. 2054 # and therefore SYMROOT, needs to be set at the project level.
2059 'SYMROOT': '<(DEPTH)/xcodebuild', 2055 'SYMROOT': '<(DEPTH)/xcodebuild',
2060 }, 2056 },
2061 } 2057 }
OLDNEW
« no previous file with comments | « no previous file | views/widget/widget.cc » ('j') | views/widget/widget.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698