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

Side by Side Diff: build/common.gypi

Issue 14624010: Change MessagePumpLinux to MessagePumpOzone (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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/build_config.h ('k') | ui/ui.gyp » ('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.
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 29
30 # Whether or not we are using the embedded messagepump.
31 'use_messagepump_linux%': 0,
32
33 # Use a raw surface abstraction. 30 # Use a raw surface abstraction.
34 'use_ozone%': 0, 31 'use_ozone%': 0,
35 }, 32 },
36 # Copy conditionally-set variables out one scope. 33 # Copy conditionally-set variables out one scope.
37 'chromeos%': '<(chromeos)', 34 'chromeos%': '<(chromeos)',
38 'use_aura%': '<(use_aura)', 35 'use_aura%': '<(use_aura)',
39 'use_ash%': '<(use_ash)', 36 'use_ash%': '<(use_ash)',
40 'use_ozone%': '<(use_ozone)', 37 'use_ozone%': '<(use_ozone)',
41 38
42 # Whether or not we are using the /dev/input/event* message pump.
43 'use_messagepump_linux%': '<(use_messagepump_linux)',
44
45 # Whether we are using Views Toolkit 39 # Whether we are using Views Toolkit
46 'toolkit_views%': 0, 40 'toolkit_views%': 0,
47 41
48 # 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
49 'use_openssl%': 0, 43 'use_openssl%': 0,
50 44
51 # Disable viewport meta tag by default. 45 # Disable viewport meta tag by default.
52 'enable_viewport%': 0, 46 'enable_viewport%': 0,
53 47
54 # Enable HiDPI support. 48 # Enable HiDPI support.
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 # gyp. 88 # gyp.
95 'host_arch%': 89 'host_arch%':
96 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s /arm.*/arm/;s/i86pc/ia32/")', 90 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s /arm.*/arm/;s/i86pc/ia32/")',
97 }], 91 }],
98 ], 92 ],
99 }, 93 },
100 # Copy conditionally-set variables out one scope. 94 # Copy conditionally-set variables out one scope.
101 'chromeos%': '<(chromeos)', 95 'chromeos%': '<(chromeos)',
102 'use_aura%': '<(use_aura)', 96 'use_aura%': '<(use_aura)',
103 'use_ash%': '<(use_ash)', 97 'use_ash%': '<(use_ash)',
104 'use_messagepump_linux%': '<(use_messagepump_linux)',
105 'use_ozone%': '<(use_ozone)', 98 'use_ozone%': '<(use_ozone)',
106 'use_openssl%': '<(use_openssl)', 99 'use_openssl%': '<(use_openssl)',
107 'enable_viewport%': '<(enable_viewport)', 100 'enable_viewport%': '<(enable_viewport)',
108 'enable_hidpi%': '<(enable_hidpi)', 101 'enable_hidpi%': '<(enable_hidpi)',
109 'enable_touch_ui%': '<(enable_touch_ui)', 102 'enable_touch_ui%': '<(enable_touch_ui)',
110 'buildtype%': '<(buildtype)', 103 'buildtype%': '<(buildtype)',
111 'host_arch%': '<(host_arch)', 104 'host_arch%': '<(host_arch)',
112 105
113 # Default architecture we're building for is the architecture we're 106 # Default architecture we're building for is the architecture we're
114 # building on. 107 # building on.
(...skipping 18 matching lines...) Expand all
133 126
134 'conditions': [ 127 'conditions': [
135 # Set default value of toolkit_views based on OS. 128 # Set default value of toolkit_views based on OS.
136 ['OS=="win" or chromeos==1 or use_aura==1', { 129 ['OS=="win" or chromeos==1 or use_aura==1', {
137 'toolkit_views%': 1, 130 'toolkit_views%': 1,
138 }, { 131 }, {
139 'toolkit_views%': 0, 132 'toolkit_views%': 0,
140 }], 133 }],
141 134
142 # Set toolkit_uses_gtk for the Chromium browser on Linux. 135 # Set toolkit_uses_gtk for the Chromium browser on Linux.
143 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0 and use_messagepump_linux==0', { 136 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0 and use_ozone==0', {
144 'toolkit_uses_gtk%': 1, 137 'toolkit_uses_gtk%': 1,
145 }, { 138 }, {
146 'toolkit_uses_gtk%': 0, 139 'toolkit_uses_gtk%': 0,
147 }], 140 }],
148 141
149 # Enable HiDPI on Mac OS and Chrome OS. 142 # Enable HiDPI on Mac OS and Chrome OS.
150 ['OS=="mac" or chromeos==1', { 143 ['OS=="mac" or chromeos==1', {
151 'enable_hidpi%': 1, 144 'enable_hidpi%': 1,
152 }], 145 }],
153 146
(...skipping 25 matching lines...) Expand all
179 }, 172 },
180 173
181 # Copy conditionally-set variables out one scope. 174 # Copy conditionally-set variables out one scope.
182 'chromeos%': '<(chromeos)', 175 'chromeos%': '<(chromeos)',
183 'host_arch%': '<(host_arch)', 176 'host_arch%': '<(host_arch)',
184 'target_arch%': '<(target_arch)', 177 'target_arch%': '<(target_arch)',
185 'toolkit_views%': '<(toolkit_views)', 178 'toolkit_views%': '<(toolkit_views)',
186 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 179 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
187 'use_aura%': '<(use_aura)', 180 'use_aura%': '<(use_aura)',
188 'use_ash%': '<(use_ash)', 181 'use_ash%': '<(use_ash)',
189 'use_messagepump_linux%': '<(use_messagepump_linux)',
190 'use_ozone%': '<(use_ozone)', 182 'use_ozone%': '<(use_ozone)',
191 'use_openssl%': '<(use_openssl)', 183 'use_openssl%': '<(use_openssl)',
192 'enable_viewport%': '<(enable_viewport)', 184 'enable_viewport%': '<(enable_viewport)',
193 'enable_hidpi%': '<(enable_hidpi)', 185 'enable_hidpi%': '<(enable_hidpi)',
194 'enable_touch_ui%': '<(enable_touch_ui)', 186 'enable_touch_ui%': '<(enable_touch_ui)',
195 'android_webview_build%': '<(android_webview_build)', 187 'android_webview_build%': '<(android_webview_build)',
196 'google_tv%': '<(google_tv)', 188 'google_tv%': '<(google_tv)',
197 'inside_chromium_build%': '<(inside_chromium_build)', 189 'inside_chromium_build%': '<(inside_chromium_build)',
198 'enable_app_list%': '<(enable_app_list)', 190 'enable_app_list%': '<(enable_app_list)',
199 'enable_message_center%': '<(enable_message_center)', 191 'enable_message_center%': '<(enable_message_center)',
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 }], 435 }],
444 436
445 # NSS usage. 437 # NSS usage.
446 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and u se_openssl==0', { 438 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and u se_openssl==0', {
447 'use_nss%': 1, 439 'use_nss%': 1,
448 }, { 440 }, {
449 'use_nss%': 0, 441 'use_nss%': 0,
450 }], 442 }],
451 443
452 # Flags to use X11 on non-Mac POSIX platforms. 444 # Flags to use X11 on non-Mac POSIX platforms.
453 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_messagepum p_linux==1', { 445 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_ozone==1', {
454 'use_x11%': 0, 446 'use_x11%': 0,
455 }, { 447 }, {
456 'use_x11%': 1, 448 'use_x11%': 1,
457 }], 449 }],
458 450
459 # Flags to use glib on non-Mac POSIX platforms. 451 # Flags to use glib on non-Mac POSIX platforms.
460 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', { 452 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', {
461 'use_glib%': 0, 453 'use_glib%': 0,
462 }, { 454 }, {
463 'use_glib%': 1, 455 'use_glib%': 1,
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
717 'host_arch%': '<(host_arch)', 709 'host_arch%': '<(host_arch)',
718 'toolkit_views%': '<(toolkit_views)', 710 'toolkit_views%': '<(toolkit_views)',
719 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 711 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
720 'use_aura%': '<(use_aura)', 712 'use_aura%': '<(use_aura)',
721 'use_ash%': '<(use_ash)', 713 'use_ash%': '<(use_ash)',
722 'use_openssl%': '<(use_openssl)', 714 'use_openssl%': '<(use_openssl)',
723 'use_nss%': '<(use_nss)', 715 'use_nss%': '<(use_nss)',
724 'os_bsd%': '<(os_bsd)', 716 'os_bsd%': '<(os_bsd)',
725 'os_posix%': '<(os_posix)', 717 'os_posix%': '<(os_posix)',
726 'use_glib%': '<(use_glib)', 718 'use_glib%': '<(use_glib)',
727 'use_messagepump_linux%': '<(use_messagepump_linux)',
728 'use_ozone%': '<(use_ozone)', 719 'use_ozone%': '<(use_ozone)',
729 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 720 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
730 'use_x11%': '<(use_x11)', 721 'use_x11%': '<(use_x11)',
731 'use_gnome_keyring%': '<(use_gnome_keyring)', 722 'use_gnome_keyring%': '<(use_gnome_keyring)',
732 'linux_fpic%': '<(linux_fpic)', 723 'linux_fpic%': '<(linux_fpic)',
733 'chromeos%': '<(chromeos)', 724 'chromeos%': '<(chromeos)',
734 'enable_viewport%': '<(enable_viewport)', 725 'enable_viewport%': '<(enable_viewport)',
735 'enable_hidpi%': '<(enable_hidpi)', 726 'enable_hidpi%': '<(enable_hidpi)',
736 'enable_touch_ui%': '<(enable_touch_ui)', 727 'enable_touch_ui%': '<(enable_touch_ui)',
737 'use_xi2_mt%':'<(use_xi2_mt)', 728 'use_xi2_mt%':'<(use_xi2_mt)',
(...skipping 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after
1856 }], 1847 }],
1857 ['ui_compositor_image_transport==1', { 1848 ['ui_compositor_image_transport==1', {
1858 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], 1849 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'],
1859 }], 1850 }],
1860 ['use_aura==1', { 1851 ['use_aura==1', {
1861 'defines': ['USE_AURA=1'], 1852 'defines': ['USE_AURA=1'],
1862 }], 1853 }],
1863 ['use_ash==1', { 1854 ['use_ash==1', {
1864 'defines': ['USE_ASH=1'], 1855 'defines': ['USE_ASH=1'],
1865 }], 1856 }],
1866 ['use_messagepump_linux==1', {
1867 'defines': ['USE_MESSAGEPUMP_LINUX=1'],
1868 }],
1869 ['use_ozone==1', { 1857 ['use_ozone==1', {
1870 'defines': ['USE_OZONE=1'], 1858 'defines': ['USE_OZONE=1'],
1871 }], 1859 }],
1872 ['use_default_render_theme==1', { 1860 ['use_default_render_theme==1', {
1873 'defines': ['USE_DEFAULT_RENDER_THEME=1'], 1861 'defines': ['USE_DEFAULT_RENDER_THEME=1'],
1874 }], 1862 }],
1875 ['use_libjpeg_turbo==1', { 1863 ['use_libjpeg_turbo==1', {
1876 'defines': ['USE_LIBJPEG_TURBO=1'], 1864 'defines': ['USE_LIBJPEG_TURBO=1'],
1877 }], 1865 }],
1878 ['use_nss==1', { 1866 ['use_nss==1', {
(...skipping 2565 matching lines...) Expand 10 before | Expand all | Expand 10 after
4444 # settings in target dicts. SYMROOT is a special case, because many other 4432 # settings in target dicts. SYMROOT is a special case, because many other
4445 # Xcode variables depend on it, including variables such as 4433 # Xcode variables depend on it, including variables such as
4446 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4434 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4447 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4435 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4448 # files to appear (when present) in the UI as actual files and not red 4436 # files to appear (when present) in the UI as actual files and not red
4449 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4437 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4450 # and therefore SYMROOT, needs to be set at the project level. 4438 # and therefore SYMROOT, needs to be set at the project level.
4451 'SYMROOT': '<(DEPTH)/xcodebuild', 4439 'SYMROOT': '<(DEPTH)/xcodebuild',
4452 }, 4440 },
4453 } 4441 }
OLDNEW
« no previous file with comments | « build/build_config.h ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698