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

Side by Side Diff: build/common.gypi

Issue 11485006: Add window manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address more review feedback Created 7 years, 10 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.
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. 16 # dict that operate on these variables.
17 'variables': { 17 'variables': {
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 or not we are using the Aura windowing framework. 24 # Whether or not we are using the Aura windowing framework.
25 'use_aura%': 0, 25 'use_aura%': 0,
26 26
27 # Whether or not we are building the Ash shell. 27 # Whether or not we are building the Ash shell.
28 'use_ash%': 0, 28 'use_ash%': 0,
29
30 # Whether or not we are building the window manager.
31 'use_wm%': 0,
29 }, 32 },
30 # Copy conditionally-set variables out one scope. 33 # Copy conditionally-set variables out one scope.
31 'chromeos%': '<(chromeos)', 34 'chromeos%': '<(chromeos)',
32 'use_aura%': '<(use_aura)', 35 'use_aura%': '<(use_aura)',
33 'use_ash%': '<(use_ash)', 36 'use_ash%': '<(use_ash)',
37 'use_wm%': '<(use_wm)',
34 38
35 # Whether we are using Views Toolkit 39 # Whether we are using Views Toolkit
36 'toolkit_views%': 0, 40 'toolkit_views%': 0,
37 41
38 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803 42 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803
39 'use_openssl%': 0, 43 'use_openssl%': 0,
40 44
41 # Disable viewport meta tag by default. 45 # Disable viewport meta tag by default.
42 'enable_viewport%': 0, 46 'enable_viewport%': 0,
43 47
(...skipping 13 matching lines...) Expand all
57 # non-Official # builds). 61 # non-Official # builds).
58 'buildtype%': 'Dev', 62 'buildtype%': 'Dev',
59 63
60 'conditions': [ 64 'conditions': [
61 # ChromeOS implies ash. 65 # ChromeOS implies ash.
62 ['chromeos==1', { 66 ['chromeos==1', {
63 'use_ash%': 1, 67 'use_ash%': 1,
64 'use_aura%': 1, 68 'use_aura%': 1,
65 }], 69 }],
66 70
71 # Wm implies ash.
72 ['use_wm==1', {
73 'use_ash%': 1,
74 'use_aura%': 1,
75 }],
76
67 # For now, Windows builds that |use_aura| should also imply using 77 # For now, Windows builds that |use_aura| should also imply using
68 # ash. This rule should be removed for the future when Windows is 78 # ash. This rule should be removed for the future when Windows is
69 # using the aura windows without the ash interface. 79 # using the aura windows without the ash interface.
70 ['use_aura==1 and OS=="win"', { 80 ['use_aura==1 and OS=="win"', {
71 'use_ash%': 1, 81 'use_ash%': 1,
72 }], 82 }],
73 ['use_ash==1', { 83 ['use_ash==1', {
74 'use_aura%': 1, 84 'use_aura%': 1,
75 }], 85 }],
76 86
77 # Compute the architecture that we're building on. 87 # Compute the architecture that we're building on.
78 ['OS=="win" or OS=="mac" or OS=="ios"', { 88 ['OS=="win" or OS=="mac" or OS=="ios"', {
79 'host_arch%': 'ia32', 89 'host_arch%': 'ia32',
80 }, { 90 }, {
81 # This handles the Unix platforms for which there is some support. 91 # This handles the Unix platforms for which there is some support.
82 # Anything else gets passed through, which probably won't work 92 # Anything else gets passed through, which probably won't work
83 # very well; such hosts should pass an explicit target_arch to 93 # very well; such hosts should pass an explicit target_arch to
84 # gyp. 94 # gyp.
85 'host_arch%': 95 'host_arch%':
86 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s /arm.*/arm/;s/i86pc/ia32/")', 96 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s /arm.*/arm/;s/i86pc/ia32/")',
87 }], 97 }],
88 ], 98 ],
89 }, 99 },
90 # Copy conditionally-set variables out one scope. 100 # Copy conditionally-set variables out one scope.
91 'chromeos%': '<(chromeos)', 101 'chromeos%': '<(chromeos)',
92 'use_aura%': '<(use_aura)', 102 'use_aura%': '<(use_aura)',
93 'use_ash%': '<(use_ash)', 103 'use_ash%': '<(use_ash)',
104 'use_wm%': '<(use_wm)',
94 'use_openssl%': '<(use_openssl)', 105 'use_openssl%': '<(use_openssl)',
95 'enable_viewport%': '<(enable_viewport)', 106 'enable_viewport%': '<(enable_viewport)',
96 'enable_hidpi%': '<(enable_hidpi)', 107 'enable_hidpi%': '<(enable_hidpi)',
97 'enable_touch_ui%': '<(enable_touch_ui)', 108 'enable_touch_ui%': '<(enable_touch_ui)',
98 'buildtype%': '<(buildtype)', 109 'buildtype%': '<(buildtype)',
99 'host_arch%': '<(host_arch)', 110 'host_arch%': '<(host_arch)',
100 111
101 # Default architecture we're building for is the architecture we're 112 # Default architecture we're building for is the architecture we're
102 # building on. 113 # building on.
103 'target_arch%': '<(host_arch)', 114 'target_arch%': '<(host_arch)',
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 }, 169 },
159 170
160 # Copy conditionally-set variables out one scope. 171 # Copy conditionally-set variables out one scope.
161 'chromeos%': '<(chromeos)', 172 'chromeos%': '<(chromeos)',
162 'host_arch%': '<(host_arch)', 173 'host_arch%': '<(host_arch)',
163 'target_arch%': '<(target_arch)', 174 'target_arch%': '<(target_arch)',
164 'toolkit_views%': '<(toolkit_views)', 175 'toolkit_views%': '<(toolkit_views)',
165 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 176 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
166 'use_aura%': '<(use_aura)', 177 'use_aura%': '<(use_aura)',
167 'use_ash%': '<(use_ash)', 178 'use_ash%': '<(use_ash)',
179 'use_wm%': '<(use_wm)',
168 'use_openssl%': '<(use_openssl)', 180 'use_openssl%': '<(use_openssl)',
169 'enable_viewport%': '<(enable_viewport)', 181 'enable_viewport%': '<(enable_viewport)',
170 'enable_hidpi%': '<(enable_hidpi)', 182 'enable_hidpi%': '<(enable_hidpi)',
171 'enable_touch_ui%': '<(enable_touch_ui)', 183 'enable_touch_ui%': '<(enable_touch_ui)',
172 'android_build_type%': '<(android_build_type)', 184 'android_build_type%': '<(android_build_type)',
173 'google_tv%': '<(google_tv)', 185 'google_tv%': '<(google_tv)',
174 'enable_app_list%': '<(enable_app_list)', 186 'enable_app_list%': '<(enable_app_list)',
175 'enable_message_center%': '<(enable_message_center)', 187 'enable_message_center%': '<(enable_message_center)',
176 'use_default_render_theme%': '<(use_default_render_theme)', 188 'use_default_render_theme%': '<(use_default_render_theme)',
177 'enable_web_intents%': 0, # TODO(thakis): Remove, http://crbug.com/173194 189 'enable_web_intents%': 0, # TODO(thakis): Remove, http://crbug.com/173194
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 664
653 # Copy conditionally-set variables out one scope. 665 # Copy conditionally-set variables out one scope.
654 'branding%': '<(branding)', 666 'branding%': '<(branding)',
655 'buildtype%': '<(buildtype)', 667 'buildtype%': '<(buildtype)',
656 'target_arch%': '<(target_arch)', 668 'target_arch%': '<(target_arch)',
657 'host_arch%': '<(host_arch)', 669 'host_arch%': '<(host_arch)',
658 'toolkit_views%': '<(toolkit_views)', 670 'toolkit_views%': '<(toolkit_views)',
659 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 671 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
660 'use_aura%': '<(use_aura)', 672 'use_aura%': '<(use_aura)',
661 'use_ash%': '<(use_ash)', 673 'use_ash%': '<(use_ash)',
674 'use_wm%': '<(use_wm)',
662 'use_openssl%': '<(use_openssl)', 675 'use_openssl%': '<(use_openssl)',
663 'use_nss%': '<(use_nss)', 676 'use_nss%': '<(use_nss)',
664 'os_bsd%': '<(os_bsd)', 677 'os_bsd%': '<(os_bsd)',
665 'os_posix%': '<(os_posix)', 678 'os_posix%': '<(os_posix)',
666 'use_glib%': '<(use_glib)', 679 'use_glib%': '<(use_glib)',
667 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 680 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
668 'use_skia%': '<(use_skia)', 681 'use_skia%': '<(use_skia)',
669 'use_x11%': '<(use_x11)', 682 'use_x11%': '<(use_x11)',
670 'use_gnome_keyring%': '<(use_gnome_keyring)', 683 'use_gnome_keyring%': '<(use_gnome_keyring)',
671 'linux_fpic%': '<(linux_fpic)', 684 'linux_fpic%': '<(linux_fpic)',
(...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after
1356 }], 1369 }],
1357 ['toolkit_views==1', { 1370 ['toolkit_views==1', {
1358 'grit_defines': ['-D', 'toolkit_views'], 1371 'grit_defines': ['-D', 'toolkit_views'],
1359 }], 1372 }],
1360 ['use_aura==1', { 1373 ['use_aura==1', {
1361 'grit_defines': ['-D', 'use_aura'], 1374 'grit_defines': ['-D', 'use_aura'],
1362 }], 1375 }],
1363 ['use_ash==1', { 1376 ['use_ash==1', {
1364 'grit_defines': ['-D', 'use_ash'], 1377 'grit_defines': ['-D', 'use_ash'],
1365 }], 1378 }],
1379 ['use_wm==1', {
1380 'grit_defines': ['-D', 'use_wm'],
1381 }],
1366 ['use_nss==1', { 1382 ['use_nss==1', {
1367 'grit_defines': ['-D', 'use_nss'], 1383 'grit_defines': ['-D', 'use_nss'],
1368 }], 1384 }],
1369 ['file_manager_extension==1', { 1385 ['file_manager_extension==1', {
1370 'grit_defines': ['-D', 'file_manager_extension'], 1386 'grit_defines': ['-D', 'file_manager_extension'],
1371 }], 1387 }],
1372 ['remoting==1', { 1388 ['remoting==1', {
1373 'grit_defines': ['-D', 'remoting'], 1389 'grit_defines': ['-D', 'remoting'],
1374 }], 1390 }],
1375 ['use_titlecase_in_grd_files==1', { 1391 ['use_titlecase_in_grd_files==1', {
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
1680 }], 1696 }],
1681 ['ui_compositor_image_transport==1', { 1697 ['ui_compositor_image_transport==1', {
1682 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], 1698 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'],
1683 }], 1699 }],
1684 ['use_aura==1', { 1700 ['use_aura==1', {
1685 'defines': ['USE_AURA=1'], 1701 'defines': ['USE_AURA=1'],
1686 }], 1702 }],
1687 ['use_ash==1', { 1703 ['use_ash==1', {
1688 'defines': ['USE_ASH=1'], 1704 'defines': ['USE_ASH=1'],
1689 }], 1705 }],
1706 ['use_wm==1', {
1707 'defines': ['USE_WM=1'],
1708 }],
1690 ['use_default_render_theme==1', { 1709 ['use_default_render_theme==1', {
1691 'defines': ['USE_DEFAULT_RENDER_THEME=1'], 1710 'defines': ['USE_DEFAULT_RENDER_THEME=1'],
1692 }], 1711 }],
1693 ['use_libjpeg_turbo==1', { 1712 ['use_libjpeg_turbo==1', {
1694 'defines': ['USE_LIBJPEG_TURBO=1'], 1713 'defines': ['USE_LIBJPEG_TURBO=1'],
1695 }], 1714 }],
1696 ['use_nss==1', { 1715 ['use_nss==1', {
1697 'defines': ['USE_NSS=1'], 1716 'defines': ['USE_NSS=1'],
1698 }], 1717 }],
1699 ['enable_one_click_signin==1', { 1718 ['enable_one_click_signin==1', {
(...skipping 2346 matching lines...) Expand 10 before | Expand all | Expand 10 after
4046 # settings in target dicts. SYMROOT is a special case, because many other 4065 # settings in target dicts. SYMROOT is a special case, because many other
4047 # Xcode variables depend on it, including variables such as 4066 # Xcode variables depend on it, including variables such as
4048 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4067 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4049 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4068 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4050 # files to appear (when present) in the UI as actual files and not red 4069 # files to appear (when present) in the UI as actual files and not red
4051 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4070 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4052 # and therefore SYMROOT, needs to be set at the project level. 4071 # and therefore SYMROOT, needs to be set at the project level.
4053 'SYMROOT': '<(DEPTH)/xcodebuild', 4072 'SYMROOT': '<(DEPTH)/xcodebuild',
4054 }, 4073 },
4055 } 4074 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698