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

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: Rebase and add proper use_wm flag support 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 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 # Copy conditionally-set variables out one scope. 672 # Copy conditionally-set variables out one scope.
661 'branding%': '<(branding)', 673 'branding%': '<(branding)',
662 'buildtype%': '<(buildtype)', 674 'buildtype%': '<(buildtype)',
663 'target_arch%': '<(target_arch)', 675 'target_arch%': '<(target_arch)',
664 'host_arch%': '<(host_arch)', 676 'host_arch%': '<(host_arch)',
665 'library%': 'static_library', 677 'library%': 'static_library',
666 'toolkit_views%': '<(toolkit_views)', 678 'toolkit_views%': '<(toolkit_views)',
667 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 679 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
668 'use_aura%': '<(use_aura)', 680 'use_aura%': '<(use_aura)',
669 'use_ash%': '<(use_ash)', 681 'use_ash%': '<(use_ash)',
682 'use_wm%': '<(use_wm)',
670 'use_openssl%': '<(use_openssl)', 683 'use_openssl%': '<(use_openssl)',
671 'use_nss%': '<(use_nss)', 684 'use_nss%': '<(use_nss)',
672 'os_bsd%': '<(os_bsd)', 685 'os_bsd%': '<(os_bsd)',
673 'os_posix%': '<(os_posix)', 686 'os_posix%': '<(os_posix)',
674 'use_glib%': '<(use_glib)', 687 'use_glib%': '<(use_glib)',
675 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 688 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
676 'use_skia%': '<(use_skia)', 689 'use_skia%': '<(use_skia)',
677 'use_x11%': '<(use_x11)', 690 'use_x11%': '<(use_x11)',
678 'use_gnome_keyring%': '<(use_gnome_keyring)', 691 'use_gnome_keyring%': '<(use_gnome_keyring)',
679 'linux_fpic%': '<(linux_fpic)', 692 'linux_fpic%': '<(linux_fpic)',
(...skipping 681 matching lines...) Expand 10 before | Expand all | Expand 10 after
1361 }], 1374 }],
1362 ['toolkit_views==1', { 1375 ['toolkit_views==1', {
1363 'grit_defines': ['-D', 'toolkit_views'], 1376 'grit_defines': ['-D', 'toolkit_views'],
1364 }], 1377 }],
1365 ['use_aura==1', { 1378 ['use_aura==1', {
1366 'grit_defines': ['-D', 'use_aura'], 1379 'grit_defines': ['-D', 'use_aura'],
1367 }], 1380 }],
1368 ['use_ash==1', { 1381 ['use_ash==1', {
1369 'grit_defines': ['-D', 'use_ash'], 1382 'grit_defines': ['-D', 'use_ash'],
1370 }], 1383 }],
1384 ['use_wm==1', {
1385 'grit_defines': ['-D', 'use_wm'],
1386 }],
1371 ['use_nss==1', { 1387 ['use_nss==1', {
1372 'grit_defines': ['-D', 'use_nss'], 1388 'grit_defines': ['-D', 'use_nss'],
1373 }], 1389 }],
1374 ['file_manager_extension==1', { 1390 ['file_manager_extension==1', {
1375 'grit_defines': ['-D', 'file_manager_extension'], 1391 'grit_defines': ['-D', 'file_manager_extension'],
1376 }], 1392 }],
1377 ['remoting==1', { 1393 ['remoting==1', {
1378 'grit_defines': ['-D', 'remoting'], 1394 'grit_defines': ['-D', 'remoting'],
1379 }], 1395 }],
1380 ['use_titlecase_in_grd_files==1', { 1396 ['use_titlecase_in_grd_files==1', {
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
1682 }], 1698 }],
1683 ['ui_compositor_image_transport==1', { 1699 ['ui_compositor_image_transport==1', {
1684 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], 1700 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'],
1685 }], 1701 }],
1686 ['use_aura==1', { 1702 ['use_aura==1', {
1687 'defines': ['USE_AURA=1'], 1703 'defines': ['USE_AURA=1'],
1688 }], 1704 }],
1689 ['use_ash==1', { 1705 ['use_ash==1', {
1690 'defines': ['USE_ASH=1'], 1706 'defines': ['USE_ASH=1'],
1691 }], 1707 }],
1708 ['use_wm==1', {
1709 'defines': ['USE_WM=1'],
1710 }],
1692 ['use_default_render_theme==1', { 1711 ['use_default_render_theme==1', {
1693 'defines': ['USE_DEFAULT_RENDER_THEME=1'], 1712 'defines': ['USE_DEFAULT_RENDER_THEME=1'],
1694 }], 1713 }],
1695 ['use_libjpeg_turbo==1', { 1714 ['use_libjpeg_turbo==1', {
1696 'defines': ['USE_LIBJPEG_TURBO=1'], 1715 'defines': ['USE_LIBJPEG_TURBO=1'],
1697 }], 1716 }],
1698 ['use_nss==1', { 1717 ['use_nss==1', {
1699 'defines': ['USE_NSS=1'], 1718 'defines': ['USE_NSS=1'],
1700 }], 1719 }],
1701 ['enable_one_click_signin==1', { 1720 ['enable_one_click_signin==1', {
(...skipping 2324 matching lines...) Expand 10 before | Expand all | Expand 10 after
4026 # settings in target dicts. SYMROOT is a special case, because many other 4045 # settings in target dicts. SYMROOT is a special case, because many other
4027 # Xcode variables depend on it, including variables such as 4046 # Xcode variables depend on it, including variables such as
4028 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4047 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4029 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4048 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4030 # files to appear (when present) in the UI as actual files and not red 4049 # files to appear (when present) in the UI as actual files and not red
4031 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4050 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4032 # and therefore SYMROOT, needs to be set at the project level. 4051 # and therefore SYMROOT, needs to be set at the project level.
4033 'SYMROOT': '<(DEPTH)/xcodebuild', 4052 'SYMROOT': '<(DEPTH)/xcodebuild',
4034 }, 4053 },
4035 } 4054 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698