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

Side by Side Diff: build/common.gypi

Issue 7473010: Adding Wayland message loop and gyp build deps (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 5 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
« base/message_pump_wayland.h ('K') | « build/all.gyp ('k') | no next file » | 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) 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.
(...skipping 22 matching lines...) Expand all
33 'toolkit_uses_pure_views%': 0, 33 'toolkit_uses_pure_views%': 0,
34 34
35 # Disable touch support by default. 35 # Disable touch support by default.
36 'touchui%': 0, 36 'touchui%': 0,
37 37
38 # Disable webui certificate viewer until it is complete. 38 # Disable webui certificate viewer until it is complete.
39 'webui_certificate_viewer%': 0, 39 'webui_certificate_viewer%': 0,
40 40
41 # Whether the compositor is enabled on views. 41 # Whether the compositor is enabled on views.
42 'views_compositor%': 0, 42 'views_compositor%': 0,
43
44 # Whether to build for Wayland display server
45 'use_wayland%': 0,
43 }, 46 },
44 # Copy conditionally-set variables out one scope. 47 # Copy conditionally-set variables out one scope.
45 'chromeos%': '<(chromeos)', 48 'chromeos%': '<(chromeos)',
46 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', 49 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)',
47 'touchui%': '<(touchui)', 50 'touchui%': '<(touchui)',
48 'webui_certificate_viewer%': '<(webui_certificate_viewer)', 51 'webui_certificate_viewer%': '<(webui_certificate_viewer)',
49 'views_compositor%': '<(views_compositor)', 52 'views_compositor%': '<(views_compositor)',
53 'use_wayland%': '<(use_wayland)',
Evan Martin 2011/07/21 16:44:21 I believe all of these nested use_foobars are not
50 54
51 # Compute the architecture that we're building on. 55 # Compute the architecture that we're building on.
52 'conditions': [ 56 'conditions': [
53 [ 'OS=="win" or OS=="mac"', { 57 [ 'OS=="win" or OS=="mac"', {
54 'host_arch%': 'ia32', 58 'host_arch%': 'ia32',
55 }, { 59 }, {
56 # This handles the Unix platforms for which there is some support. 60 # This handles the Unix platforms for which there is some support.
57 # Anything else gets passed through, which probably won't work very 61 # Anything else gets passed through, which probably won't work very
58 # well; such hosts should pass an explicit target_arch to gyp. 62 # well; such hosts should pass an explicit target_arch to gyp.
59 'host_arch%': 63 'host_arch%':
(...skipping 23 matching lines...) Expand all
83 }, 87 },
84 88
85 # Copy conditionally-set variables out one scope. 89 # Copy conditionally-set variables out one scope.
86 'chromeos%': '<(chromeos)', 90 'chromeos%': '<(chromeos)',
87 'touchui%': '<(touchui)', 91 'touchui%': '<(touchui)',
88 'webui_certificate_viewer%': '<(webui_certificate_viewer)', 92 'webui_certificate_viewer%': '<(webui_certificate_viewer)',
89 'host_arch%': '<(host_arch)', 93 'host_arch%': '<(host_arch)',
90 'toolkit_views%': '<(toolkit_views)', 94 'toolkit_views%': '<(toolkit_views)',
91 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', 95 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)',
92 'views_compositor%': '<(views_compositor)', 96 'views_compositor%': '<(views_compositor)',
97 'use_wayland%': '<(use_wayland)',
93 98
94 # We used to provide a variable for changing how libraries were built. 99 # We used to provide a variable for changing how libraries were built.
95 # This variable remains until we can clean up all the users. 100 # This variable remains until we can clean up all the users.
96 # This needs to be one nested variables dict in so that dependent 101 # This needs to be one nested variables dict in so that dependent
97 # gyp files can make use of it in their outer variables. (Yikes!) 102 # gyp files can make use of it in their outer variables. (Yikes!)
98 # http://code.google.com/p/chromium/issues/detail?id=83308 103 # http://code.google.com/p/chromium/issues/detail?id=83308
99 'library%': 'static_library', 104 'library%': 'static_library',
100 105
101 # Override branding to select the desired branding flavor. 106 # Override branding to select the desired branding flavor.
102 'branding%': 'Chromium', 107 'branding%': 'Chromium',
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 'os_posix%': 0, 209 'os_posix%': 0,
205 }, { 210 }, {
206 'os_posix%': 1, 211 'os_posix%': 1,
207 }], 212 }],
208 213
209 # Flags to use Gtk and X11 on non-Mac POSIX platforms 214 # Flags to use Gtk and X11 on non-Mac POSIX platforms
210 ['OS=="win" or OS=="mac"', { 215 ['OS=="win" or OS=="mac"', {
211 'toolkit_uses_gtk%': 0, 216 'toolkit_uses_gtk%': 0,
212 'use_x11%': 0, 217 'use_x11%': 0,
213 }, { 218 }, {
219 # TODO Wayland build should have these disabled, but currently
220 # GTK and X is too spread and it's hard to completely remove
221 # every dependency.
Evan Martin 2011/07/21 16:44:21 Can you elaborate on this comment? I don't know w
214 'toolkit_uses_gtk%': 1, 222 'toolkit_uses_gtk%': 1,
215 'use_x11%': 1, 223 'use_x11%': 1,
216 }], 224 }],
217 225
218 # A flag to enable or disable our compile-time dependency 226 # A flag to enable or disable our compile-time dependency
219 # on gnome-keyring. If that dependency is disabled, no gnome-keyring 227 # on gnome-keyring. If that dependency is disabled, no gnome-keyring
220 # support will be available. This option is useful 228 # support will be available. This option is useful
221 # for Linux distributions. 229 # for Linux distributions.
222 ['chromeos==1', { 230 ['chromeos==1', {
223 'use_gnome_keyring%': 0, 231 'use_gnome_keyring%': 0,
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)', 292 'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)',
285 'use_third_party_translations%': '<(use_third_party_translations)', 293 'use_third_party_translations%': '<(use_third_party_translations)',
286 'remoting%': '<(remoting)', 294 'remoting%': '<(remoting)',
287 'enable_webrtc%': '<(enable_webrtc)', 295 'enable_webrtc%': '<(enable_webrtc)',
288 'p2p_apis%': '<(p2p_apis)', 296 'p2p_apis%': '<(p2p_apis)',
289 'configuration_policy%': '<(configuration_policy)', 297 'configuration_policy%': '<(configuration_policy)',
290 'safe_browsing%': '<(safe_browsing)', 298 'safe_browsing%': '<(safe_browsing)',
291 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 299 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
292 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', 300 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
293 'enable_smooth_scrolling%': '<(enable_smooth_scrolling)', 301 'enable_smooth_scrolling%': '<(enable_smooth_scrolling)',
302 'use_wayland%': '<(use_wayland)',
294 303
295 # The release channel that this build targets. This is used to restrict 304 # The release channel that this build targets. This is used to restrict
296 # channel-specific build options, like which installer packages to create. 305 # channel-specific build options, like which installer packages to create.
297 # The default is 'all', which does no channel-specific filtering. 306 # The default is 'all', which does no channel-specific filtering.
298 'channel%': 'all', 307 'channel%': 'all',
299 308
300 # Override chromium_mac_pch and set it to 0 to suppress the use of 309 # Override chromium_mac_pch and set it to 0 to suppress the use of
301 # precompiled headers on the Mac. Prefix header injection may still be 310 # precompiled headers on the Mac. Prefix header injection may still be
302 # used, but prefix headers will not be precompiled. This is useful when 311 # used, but prefix headers will not be precompiled. This is useful when
303 # using distcc to distribute a build to compile slaves that don't 312 # using distcc to distribute a build to compile slaves that don't
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 }], 727 }],
719 ['views_compositor==1', { 728 ['views_compositor==1', {
720 'defines': ['VIEWS_COMPOSITOR=1'], 729 'defines': ['VIEWS_COMPOSITOR=1'],
721 }], 730 }],
722 ['chromeos==1', { 731 ['chromeos==1', {
723 'defines': ['OS_CHROMEOS=1'], 732 'defines': ['OS_CHROMEOS=1'],
724 }], 733 }],
725 ['touchui==1', { 734 ['touchui==1', {
726 'defines': ['TOUCH_UI=1'], 735 'defines': ['TOUCH_UI=1'],
727 }], 736 }],
737 ['use_wayland==1', {
738 'defines': ['USE_WAYLAND=1', 'WL_EGL_PLATFORM=1'],
739 }],
728 ['file_manager_extension==1', { 740 ['file_manager_extension==1', {
729 'defines': ['FILE_MANAGER_EXTENSION=1'], 741 'defines': ['FILE_MANAGER_EXTENSION=1'],
730 }], 742 }],
731 ['profiling==1', { 743 ['profiling==1', {
732 'defines': ['ENABLE_PROFILING=1'], 744 'defines': ['ENABLE_PROFILING=1'],
733 }], 745 }],
734 ['remoting==1', { 746 ['remoting==1', {
735 'defines': ['ENABLE_REMOTING=1'], 747 'defines': ['ENABLE_REMOTING=1'],
736 }], 748 }],
737 ['p2p_apis==1', { 749 ['p2p_apis==1', {
(...skipping 1133 matching lines...) Expand 10 before | Expand all | Expand 10 after
1871 # settings in target dicts. SYMROOT is a special case, because many other 1883 # settings in target dicts. SYMROOT is a special case, because many other
1872 # Xcode variables depend on it, including variables such as 1884 # Xcode variables depend on it, including variables such as
1873 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 1885 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
1874 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 1886 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
1875 # files to appear (when present) in the UI as actual files and not red 1887 # files to appear (when present) in the UI as actual files and not red
1876 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 1888 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
1877 # and therefore SYMROOT, needs to be set at the project level. 1889 # and therefore SYMROOT, needs to be set at the project level.
1878 'SYMROOT': '<(DEPTH)/xcodebuild', 1890 'SYMROOT': '<(DEPTH)/xcodebuild',
1879 }, 1891 },
1880 } 1892 }
OLDNEW
« base/message_pump_wayland.h ('K') | « build/all.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698