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

Side by Side Diff: build/common.gypi

Issue 7457023: Adding a Wayland basic toolkit (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Updated trunk to HEAD Created 9 years, 4 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 | build/linux/system.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) 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 }, 83 },
84 84
85 # Copy conditionally-set variables out one scope. 85 # Copy conditionally-set variables out one scope.
86 'chromeos%': '<(chromeos)', 86 'chromeos%': '<(chromeos)',
87 'touchui%': '<(touchui)', 87 'touchui%': '<(touchui)',
88 'webui_certificate_viewer%': '<(webui_certificate_viewer)', 88 'webui_certificate_viewer%': '<(webui_certificate_viewer)',
89 'host_arch%': '<(host_arch)', 89 'host_arch%': '<(host_arch)',
90 'toolkit_views%': '<(toolkit_views)', 90 'toolkit_views%': '<(toolkit_views)',
91 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', 91 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)',
92 'views_compositor%': '<(views_compositor)', 92 'views_compositor%': '<(views_compositor)',
93 # Whether to build for Wayland display server
94 'use_wayland%': 0,
93 95
94 # We used to provide a variable for changing how libraries were built. 96 # We used to provide a variable for changing how libraries were built.
95 # This variable remains until we can clean up all the users. 97 # This variable remains until we can clean up all the users.
96 # This needs to be one nested variables dict in so that dependent 98 # 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!) 99 # gyp files can make use of it in their outer variables. (Yikes!)
98 # http://code.google.com/p/chromium/issues/detail?id=83308 100 # http://code.google.com/p/chromium/issues/detail?id=83308
99 'library%': 'static_library', 101 'library%': 'static_library',
100 102
101 # Override branding to select the desired branding flavor. 103 # Override branding to select the desired branding flavor.
102 'branding%': 'Chromium', 104 'branding%': 'Chromium',
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 'os_posix%': 0, 206 'os_posix%': 0,
205 }, { 207 }, {
206 'os_posix%': 1, 208 'os_posix%': 1,
207 }], 209 }],
208 210
209 # Flags to use Gtk and X11 on non-Mac POSIX platforms 211 # Flags to use Gtk and X11 on non-Mac POSIX platforms
210 ['OS=="win" or OS=="mac"', { 212 ['OS=="win" or OS=="mac"', {
211 'toolkit_uses_gtk%': 0, 213 'toolkit_uses_gtk%': 0,
212 'use_x11%': 0, 214 'use_x11%': 0,
213 }, { 215 }, {
216 # TODO(dnicoara) Wayland build should have these disabled, but
217 # currently GTK and X is too spread and it's hard to completely
218 # remove every dependency.
214 'toolkit_uses_gtk%': 1, 219 'toolkit_uses_gtk%': 1,
215 'use_x11%': 1, 220 'use_x11%': 1,
216 }], 221 }],
217 222
218 # A flag to enable or disable our compile-time dependency 223 # A flag to enable or disable our compile-time dependency
219 # on gnome-keyring. If that dependency is disabled, no gnome-keyring 224 # on gnome-keyring. If that dependency is disabled, no gnome-keyring
220 # support will be available. This option is useful 225 # support will be available. This option is useful
221 # for Linux distributions. 226 # for Linux distributions.
222 ['chromeos==1', { 227 ['chromeos==1', {
223 'use_gnome_keyring%': 0, 228 '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)', 289 'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)',
285 'use_third_party_translations%': '<(use_third_party_translations)', 290 'use_third_party_translations%': '<(use_third_party_translations)',
286 'remoting%': '<(remoting)', 291 'remoting%': '<(remoting)',
287 'enable_webrtc%': '<(enable_webrtc)', 292 'enable_webrtc%': '<(enable_webrtc)',
288 'p2p_apis%': '<(p2p_apis)', 293 'p2p_apis%': '<(p2p_apis)',
289 'configuration_policy%': '<(configuration_policy)', 294 'configuration_policy%': '<(configuration_policy)',
290 'safe_browsing%': '<(safe_browsing)', 295 'safe_browsing%': '<(safe_browsing)',
291 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 296 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
292 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', 297 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
293 'enable_smooth_scrolling%': '<(enable_smooth_scrolling)', 298 'enable_smooth_scrolling%': '<(enable_smooth_scrolling)',
299 'use_wayland%': '<(use_wayland)',
294 300
295 # The release channel that this build targets. This is used to restrict 301 # The release channel that this build targets. This is used to restrict
296 # channel-specific build options, like which installer packages to create. 302 # channel-specific build options, like which installer packages to create.
297 # The default is 'all', which does no channel-specific filtering. 303 # The default is 'all', which does no channel-specific filtering.
298 'channel%': 'all', 304 'channel%': 'all',
299 305
300 # Override chromium_mac_pch and set it to 0 to suppress the use of 306 # 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 307 # precompiled headers on the Mac. Prefix header injection may still be
302 # used, but prefix headers will not be precompiled. This is useful when 308 # 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 309 # using distcc to distribute a build to compile slaves that don't
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
725 }], 731 }],
726 ['views_compositor==1', { 732 ['views_compositor==1', {
727 'defines': ['VIEWS_COMPOSITOR=1'], 733 'defines': ['VIEWS_COMPOSITOR=1'],
728 }], 734 }],
729 ['chromeos==1', { 735 ['chromeos==1', {
730 'defines': ['OS_CHROMEOS=1'], 736 'defines': ['OS_CHROMEOS=1'],
731 }], 737 }],
732 ['touchui==1', { 738 ['touchui==1', {
733 'defines': ['TOUCH_UI=1'], 739 'defines': ['TOUCH_UI=1'],
734 }], 740 }],
741 ['use_wayland==1', {
742 'defines': ['USE_WAYLAND=1', 'WL_EGL_PLATFORM=1'],
743 }],
735 ['file_manager_extension==1', { 744 ['file_manager_extension==1', {
736 'defines': ['FILE_MANAGER_EXTENSION=1'], 745 'defines': ['FILE_MANAGER_EXTENSION=1'],
737 }], 746 }],
738 ['profiling==1', { 747 ['profiling==1', {
739 'defines': ['ENABLE_PROFILING=1'], 748 'defines': ['ENABLE_PROFILING=1'],
740 }], 749 }],
741 ['remoting==1', { 750 ['remoting==1', {
742 'defines': ['ENABLE_REMOTING=1'], 751 'defines': ['ENABLE_REMOTING=1'],
743 }], 752 }],
744 ['p2p_apis==1', { 753 ['p2p_apis==1', {
(...skipping 1155 matching lines...) Expand 10 before | Expand all | Expand 10 after
1900 # settings in target dicts. SYMROOT is a special case, because many other 1909 # settings in target dicts. SYMROOT is a special case, because many other
1901 # Xcode variables depend on it, including variables such as 1910 # Xcode variables depend on it, including variables such as
1902 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 1911 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
1903 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 1912 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
1904 # files to appear (when present) in the UI as actual files and not red 1913 # files to appear (when present) in the UI as actual files and not red
1905 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 1914 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
1906 # and therefore SYMROOT, needs to be set at the project level. 1915 # and therefore SYMROOT, needs to be set at the project level.
1907 'SYMROOT': '<(DEPTH)/xcodebuild', 1916 'SYMROOT': '<(DEPTH)/xcodebuild',
1908 }, 1917 },
1909 } 1918 }
OLDNEW
« no previous file with comments | « no previous file | build/linux/system.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698