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

Side by Side Diff: build/common.gypi

Issue 17265006: wayland patch for inspection Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | « base/wayland/wayland_event.h ('k') | build/filename_rules.gypi » ('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.
(...skipping 11 matching lines...) Expand all
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 # Use a raw surface abstraction. 30 # Use a raw surface abstraction.
31 'use_ozone%': 0, 31 'use_ozone%': 0,
32
33 # Use Wayland system
34 'use_wayland%': 0,
32 }, 35 },
33 # Copy conditionally-set variables out one scope. 36 # Copy conditionally-set variables out one scope.
34 'chromeos%': '<(chromeos)', 37 'chromeos%': '<(chromeos)',
35 'use_aura%': '<(use_aura)', 38 'use_aura%': '<(use_aura)',
36 'use_ash%': '<(use_ash)', 39 'use_ash%': '<(use_ash)',
37 'use_ozone%': '<(use_ozone)', 40 'use_ozone%': '<(use_ozone)',
41 'use_wayland%': '<(use_wayland)',
38 42
39 # Whether we are using Views Toolkit 43 # Whether we are using Views Toolkit
40 'toolkit_views%': 0, 44 'toolkit_views%': 0,
41 45
42 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803 46 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803
43 'use_openssl%': 0, 47 'use_openssl%': 0,
44 48
45 # Disable viewport meta tag by default. 49 # Disable viewport meta tag by default.
46 'enable_viewport%': 0, 50 'enable_viewport%': 0,
47 51
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 'host_arch%': 96 'host_arch%':
93 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s /arm.*/arm/;s/i86pc/ia32/")', 97 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s /arm.*/arm/;s/i86pc/ia32/")',
94 }], 98 }],
95 ], 99 ],
96 }, 100 },
97 # Copy conditionally-set variables out one scope. 101 # Copy conditionally-set variables out one scope.
98 'chromeos%': '<(chromeos)', 102 'chromeos%': '<(chromeos)',
99 'use_aura%': '<(use_aura)', 103 'use_aura%': '<(use_aura)',
100 'use_ash%': '<(use_ash)', 104 'use_ash%': '<(use_ash)',
101 'use_ozone%': '<(use_ozone)', 105 'use_ozone%': '<(use_ozone)',
106 'use_wayland%': '<(use_wayland)',
102 'use_openssl%': '<(use_openssl)', 107 'use_openssl%': '<(use_openssl)',
103 'enable_viewport%': '<(enable_viewport)', 108 'enable_viewport%': '<(enable_viewport)',
104 'enable_hidpi%': '<(enable_hidpi)', 109 'enable_hidpi%': '<(enable_hidpi)',
105 'enable_touch_ui%': '<(enable_touch_ui)', 110 'enable_touch_ui%': '<(enable_touch_ui)',
106 'buildtype%': '<(buildtype)', 111 'buildtype%': '<(buildtype)',
107 'branding%': '<(branding)', 112 'branding%': '<(branding)',
108 'host_arch%': '<(host_arch)', 113 'host_arch%': '<(host_arch)',
109 114
110 # Default architecture we're building for is the architecture we're 115 # Default architecture we're building for is the architecture we're
111 # building on. 116 # building on.
(...skipping 13 matching lines...) Expand all
125 130
126 'conditions': [ 131 'conditions': [
127 # Set default value of toolkit_views based on OS. 132 # Set default value of toolkit_views based on OS.
128 ['OS=="win" or chromeos==1 or use_aura==1', { 133 ['OS=="win" or chromeos==1 or use_aura==1', {
129 'toolkit_views%': 1, 134 'toolkit_views%': 1,
130 }, { 135 }, {
131 'toolkit_views%': 0, 136 'toolkit_views%': 0,
132 }], 137 }],
133 138
134 # Set toolkit_uses_gtk for the Chromium browser on Linux. 139 # Set toolkit_uses_gtk for the Chromium browser on Linux.
135 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0 and use_ozone==0', { 140 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0 and use_ozone==0 and use_wayland==0', {
136 'toolkit_uses_gtk%': 1, 141 'toolkit_uses_gtk%': 1,
137 }, { 142 }, {
138 'toolkit_uses_gtk%': 0, 143 'toolkit_uses_gtk%': 0,
139 }], 144 }],
140 145
141 # Enable HiDPI on Mac OS and Chrome OS. 146 # Enable HiDPI on Mac OS and Chrome OS.
142 ['OS=="mac" or chromeos==1', { 147 ['OS=="mac" or chromeos==1', {
143 'enable_hidpi%': 1, 148 'enable_hidpi%': 1,
144 }], 149 }],
145 150
(...skipping 27 matching lines...) Expand all
173 178
174 # Copy conditionally-set variables out one scope. 179 # Copy conditionally-set variables out one scope.
175 'chromeos%': '<(chromeos)', 180 'chromeos%': '<(chromeos)',
176 'host_arch%': '<(host_arch)', 181 'host_arch%': '<(host_arch)',
177 'target_arch%': '<(target_arch)', 182 'target_arch%': '<(target_arch)',
178 'toolkit_views%': '<(toolkit_views)', 183 'toolkit_views%': '<(toolkit_views)',
179 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 184 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
180 'use_aura%': '<(use_aura)', 185 'use_aura%': '<(use_aura)',
181 'use_ash%': '<(use_ash)', 186 'use_ash%': '<(use_ash)',
182 'use_ozone%': '<(use_ozone)', 187 'use_ozone%': '<(use_ozone)',
188 'use_wayland%': '<(use_wayland)',
183 'use_openssl%': '<(use_openssl)', 189 'use_openssl%': '<(use_openssl)',
184 'enable_viewport%': '<(enable_viewport)', 190 'enable_viewport%': '<(enable_viewport)',
185 'enable_hidpi%': '<(enable_hidpi)', 191 'enable_hidpi%': '<(enable_hidpi)',
186 'enable_touch_ui%': '<(enable_touch_ui)', 192 'enable_touch_ui%': '<(enable_touch_ui)',
187 'android_webview_build%': '<(android_webview_build)', 193 'android_webview_build%': '<(android_webview_build)',
188 'google_tv%': '<(google_tv)', 194 'google_tv%': '<(google_tv)',
189 'enable_app_list%': '<(enable_app_list)', 195 'enable_app_list%': '<(enable_app_list)',
190 'use_default_render_theme%': '<(use_default_render_theme)', 196 'use_default_render_theme%': '<(use_default_render_theme)',
191 'buildtype%': '<(buildtype)', 197 'buildtype%': '<(buildtype)',
192 'branding%': '<(branding)', 198 'branding%': '<(branding)',
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 }], 447 }],
442 448
443 # NSS usage. 449 # NSS usage.
444 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and u se_openssl==0', { 450 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and u se_openssl==0', {
445 'use_nss%': 1, 451 'use_nss%': 1,
446 }, { 452 }, {
447 'use_nss%': 0, 453 'use_nss%': 0,
448 }], 454 }],
449 455
450 # Flags to use X11 on non-Mac POSIX platforms. 456 # Flags to use X11 on non-Mac POSIX platforms.
451 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_ozone==1', { 457 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_ozone==1 o r use_wayland==1', {
452 'use_x11%': 0, 458 'use_x11%': 0,
453 }, { 459 }, {
454 'use_x11%': 1, 460 'use_x11%': 1,
455 }], 461 }],
456 462
457 # Flags to use pango and glib on non-Mac POSIX platforms. 463 # Flags to use pango and glib on non-Mac POSIX platforms.
458 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', { 464 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', {
459 'use_glib%': 0, 465 'use_glib%': 0,
460 'use_pango%': 0, 466 'use_pango%': 0,
461 }, { 467 }, {
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 747 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
742 'use_aura%': '<(use_aura)', 748 'use_aura%': '<(use_aura)',
743 'use_ash%': '<(use_ash)', 749 'use_ash%': '<(use_ash)',
744 'use_openssl%': '<(use_openssl)', 750 'use_openssl%': '<(use_openssl)',
745 'use_nss%': '<(use_nss)', 751 'use_nss%': '<(use_nss)',
746 'os_bsd%': '<(os_bsd)', 752 'os_bsd%': '<(os_bsd)',
747 'os_posix%': '<(os_posix)', 753 'os_posix%': '<(os_posix)',
748 'use_glib%': '<(use_glib)', 754 'use_glib%': '<(use_glib)',
749 'use_pango%': '<(use_pango)', 755 'use_pango%': '<(use_pango)',
750 'use_ozone%': '<(use_ozone)', 756 'use_ozone%': '<(use_ozone)',
757 'use_wayland%': '<(use_wayland)',
751 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 758 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
752 'use_x11%': '<(use_x11)', 759 'use_x11%': '<(use_x11)',
753 'use_gnome_keyring%': '<(use_gnome_keyring)', 760 'use_gnome_keyring%': '<(use_gnome_keyring)',
754 'linux_fpic%': '<(linux_fpic)', 761 'linux_fpic%': '<(linux_fpic)',
755 'chromeos%': '<(chromeos)', 762 'chromeos%': '<(chromeos)',
756 'enable_viewport%': '<(enable_viewport)', 763 'enable_viewport%': '<(enable_viewport)',
757 'enable_hidpi%': '<(enable_hidpi)', 764 'enable_hidpi%': '<(enable_hidpi)',
758 'enable_touch_ui%': '<(enable_touch_ui)', 765 'enable_touch_ui%': '<(enable_touch_ui)',
759 'use_xi2_mt%':'<(use_xi2_mt)', 766 'use_xi2_mt%':'<(use_xi2_mt)',
760 'file_manager_extension%': '<(file_manager_extension)', 767 'file_manager_extension%': '<(file_manager_extension)',
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
1489 }], 1496 }],
1490 ['use_ash==1', { 1497 ['use_ash==1', {
1491 'grit_defines': ['-D', 'use_ash'], 1498 'grit_defines': ['-D', 'use_ash'],
1492 }], 1499 }],
1493 ['use_nss==1', { 1500 ['use_nss==1', {
1494 'grit_defines': ['-D', 'use_nss'], 1501 'grit_defines': ['-D', 'use_nss'],
1495 }], 1502 }],
1496 ['use_ozone==1', { 1503 ['use_ozone==1', {
1497 'grit_defines': ['-D', 'use_ozone'], 1504 'grit_defines': ['-D', 'use_ozone'],
1498 }], 1505 }],
1506 ['use_wayland==1', {
1507 'grit_defines': ['-D', 'use_wayland'],
1508 }],
1499 ['file_manager_extension==1', { 1509 ['file_manager_extension==1', {
1500 'grit_defines': ['-D', 'file_manager_extension'], 1510 'grit_defines': ['-D', 'file_manager_extension'],
1501 }], 1511 }],
1502 ['image_loader_extension==1', { 1512 ['image_loader_extension==1', {
1503 'grit_defines': ['-D', 'image_loader_extension'], 1513 'grit_defines': ['-D', 'image_loader_extension'],
1504 }], 1514 }],
1505 ['remoting==1', { 1515 ['remoting==1', {
1506 'grit_defines': ['-D', 'remoting'], 1516 'grit_defines': ['-D', 'remoting'],
1507 }], 1517 }],
1508 ['use_titlecase_in_grd_files==1', { 1518 ['use_titlecase_in_grd_files==1', {
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
1893 }], 1903 }],
1894 ['use_aura==1', { 1904 ['use_aura==1', {
1895 'defines': ['USE_AURA=1'], 1905 'defines': ['USE_AURA=1'],
1896 }], 1906 }],
1897 ['use_ash==1', { 1907 ['use_ash==1', {
1898 'defines': ['USE_ASH=1'], 1908 'defines': ['USE_ASH=1'],
1899 }], 1909 }],
1900 ['use_ozone==1', { 1910 ['use_ozone==1', {
1901 'defines': ['USE_OZONE=1'], 1911 'defines': ['USE_OZONE=1'],
1902 }], 1912 }],
1913 ['use_wayland==1', {
1914 'defines': ['USE_WAYLAND=1'],
1915 }],
1903 ['use_default_render_theme==1', { 1916 ['use_default_render_theme==1', {
1904 'defines': ['USE_DEFAULT_RENDER_THEME=1'], 1917 'defines': ['USE_DEFAULT_RENDER_THEME=1'],
1905 }], 1918 }],
1906 ['use_libjpeg_turbo==1', { 1919 ['use_libjpeg_turbo==1', {
1907 'defines': ['USE_LIBJPEG_TURBO=1'], 1920 'defines': ['USE_LIBJPEG_TURBO=1'],
1908 }], 1921 }],
1909 ['use_nss==1', { 1922 ['use_nss==1', {
1910 'defines': ['USE_NSS=1'], 1923 'defines': ['USE_NSS=1'],
1911 }], 1924 }],
1912 ['use_x11==1', { 1925 ['use_x11==1', {
(...skipping 2655 matching lines...) Expand 10 before | Expand all | Expand 10 after
4568 # settings in target dicts. SYMROOT is a special case, because many other 4581 # settings in target dicts. SYMROOT is a special case, because many other
4569 # Xcode variables depend on it, including variables such as 4582 # Xcode variables depend on it, including variables such as
4570 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4583 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4571 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4584 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4572 # files to appear (when present) in the UI as actual files and not red 4585 # files to appear (when present) in the UI as actual files and not red
4573 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4586 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4574 # and therefore SYMROOT, needs to be set at the project level. 4587 # and therefore SYMROOT, needs to be set at the project level.
4575 'SYMROOT': '<(DEPTH)/xcodebuild', 4588 'SYMROOT': '<(DEPTH)/xcodebuild',
4576 }, 4589 },
4577 } 4590 }
OLDNEW
« no previous file with comments | « base/wayland/wayland_event.h ('k') | build/filename_rules.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698