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

Side by Side Diff: build/common.gypi

Issue 238633004: Remove all uses of toolkit_use_gtk in the gyp files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 years, 8 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') | 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 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 'toolkit_views%': 0, 187 'toolkit_views%': 0,
188 }], 188 }],
189 189
190 # Embedded builds use aura without ash or views. 190 # Embedded builds use aura without ash or views.
191 ['embedded==1', { 191 ['embedded==1', {
192 'use_aura%': 1, 192 'use_aura%': 1,
193 'use_ash%': 0, 193 'use_ash%': 0,
194 'toolkit_views%': 0, 194 'toolkit_views%': 0,
195 }], 195 }],
196 196
197 # Set toolkit_uses_gtk for the Chromium browser on Linux.
198 ['desktop_linux==1 and use_aura==0 and use_ozone==0', {
199 'toolkit_uses_gtk%': 1,
200 }, {
201 'toolkit_uses_gtk%': 0,
202 }],
203
204 # Enable HiDPI on Mac OS, Chrome OS and Windows. 197 # Enable HiDPI on Mac OS, Chrome OS and Windows.
205 ['OS=="mac" or chromeos==1 or OS=="win"', { 198 ['OS=="mac" or chromeos==1 or OS=="win"', {
206 'enable_hidpi%': 1, 199 'enable_hidpi%': 1,
207 }], 200 }],
208 201
209 # Enable App Launcher on ChromeOS, Windows and OSX. 202 # Enable App Launcher on ChromeOS, Windows and OSX.
210 # On Linux, enable App Launcher for the Aura build. 203 # On Linux, enable App Launcher for the Aura build.
211 ['use_ash==1 or OS=="win" or OS=="mac" or (desktop_linux==1 and use_au ra==1)', { 204 ['use_ash==1 or OS=="win" or OS=="mac" or (desktop_linux==1 and use_au ra==1)', {
212 'enable_app_list%': 1, 205 'enable_app_list%': 1,
213 }, { 206 }, {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 }], 239 }],
247 ], 240 ],
248 }, 241 },
249 242
250 # Copy conditionally-set variables out one scope. 243 # Copy conditionally-set variables out one scope.
251 'chromeos%': '<(chromeos)', 244 'chromeos%': '<(chromeos)',
252 'host_arch%': '<(host_arch)', 245 'host_arch%': '<(host_arch)',
253 'target_arch%': '<(target_arch)', 246 'target_arch%': '<(target_arch)',
254 'target_subarch%': '<(target_subarch)', 247 'target_subarch%': '<(target_subarch)',
255 'toolkit_views%': '<(toolkit_views)', 248 'toolkit_views%': '<(toolkit_views)',
256 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
257 'desktop_linux%': '<(desktop_linux)', 249 'desktop_linux%': '<(desktop_linux)',
258 'use_aura%': '<(use_aura)', 250 'use_aura%': '<(use_aura)',
259 'use_ash%': '<(use_ash)', 251 'use_ash%': '<(use_ash)',
260 'use_cras%': '<(use_cras)', 252 'use_cras%': '<(use_cras)',
261 'use_ozone%': '<(use_ozone)', 253 'use_ozone%': '<(use_ozone)',
262 'use_ozone_evdev%': '<(use_ozone_evdev)', 254 'use_ozone_evdev%': '<(use_ozone_evdev)',
263 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', 255 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
264 'embedded%': '<(embedded)', 256 'embedded%': '<(embedded)',
265 'use_openssl%': '<(use_openssl)', 257 'use_openssl%': '<(use_openssl)',
266 'use_openssl_certs%': '<(use_openssl_certs)', 258 'use_openssl_certs%': '<(use_openssl_certs)',
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 # A flag to enable or disable our compile-time dependency 617 # A flag to enable or disable our compile-time dependency
626 # on gnome-keyring. If that dependency is disabled, no gnome-keyring 618 # on gnome-keyring. If that dependency is disabled, no gnome-keyring
627 # support will be available. This option is useful 619 # support will be available. This option is useful
628 # for Linux distributions and for Aura. 620 # for Linux distributions and for Aura.
629 ['OS!="linux" or chromeos==1', { 621 ['OS!="linux" or chromeos==1', {
630 'use_gnome_keyring%': 0, 622 'use_gnome_keyring%': 0,
631 }, { 623 }, {
632 'use_gnome_keyring%': 1, 624 'use_gnome_keyring%': 1,
633 }], 625 }],
634 626
635 ['toolkit_uses_gtk==1 or OS=="mac" or OS=="ios"', { 627 ['OS=="mac" or OS=="ios"', {
636 # GTK+, Mac and iOS want Title Case strings 628 # Mac and iOS want Title Case strings
637 'use_titlecase_in_grd_files%': 1, 629 'use_titlecase_in_grd_files%': 1,
638 }], 630 }],
639 631
640 # Enable loader extensions on Chrome OS. 632 # Enable loader extensions on Chrome OS.
641 ['chromeos==1', { 633 ['chromeos==1', {
642 'image_loader_extension%': 1, 634 'image_loader_extension%': 1,
643 }, { 635 }, {
644 'image_loader_extension%': 0, 636 'image_loader_extension%': 0,
645 }], 637 }],
646 638
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
947 'os_bsd%': '<(os_bsd)', 939 'os_bsd%': '<(os_bsd)',
948 'os_posix%': '<(os_posix)', 940 'os_posix%': '<(os_posix)',
949 'use_dbus%': '<(use_dbus)', 941 'use_dbus%': '<(use_dbus)',
950 'use_glib%': '<(use_glib)', 942 'use_glib%': '<(use_glib)',
951 'use_pango%': '<(use_pango)', 943 'use_pango%': '<(use_pango)',
952 'use_cairo%': '<(use_cairo)', 944 'use_cairo%': '<(use_cairo)',
953 'use_ozone%': '<(use_ozone)', 945 'use_ozone%': '<(use_ozone)',
954 'use_ozone_evdev%': '<(use_ozone_evdev)', 946 'use_ozone_evdev%': '<(use_ozone_evdev)',
955 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', 947 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
956 'use_system_fontconfig%': '<(use_system_fontconfig)', 948 'use_system_fontconfig%': '<(use_system_fontconfig)',
957 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
958 'desktop_linux%': '<(desktop_linux)', 949 'desktop_linux%': '<(desktop_linux)',
959 'use_x11%': '<(use_x11)', 950 'use_x11%': '<(use_x11)',
960 'use_gnome_keyring%': '<(use_gnome_keyring)', 951 'use_gnome_keyring%': '<(use_gnome_keyring)',
961 'linux_fpic%': '<(linux_fpic)', 952 'linux_fpic%': '<(linux_fpic)',
962 'chromeos%': '<(chromeos)', 953 'chromeos%': '<(chromeos)',
963 'enable_viewport%': '<(enable_viewport)', 954 'enable_viewport%': '<(enable_viewport)',
964 'enable_hidpi%': '<(enable_hidpi)', 955 'enable_hidpi%': '<(enable_hidpi)',
965 'use_xi2_mt%':'<(use_xi2_mt)', 956 'use_xi2_mt%':'<(use_xi2_mt)',
966 'image_loader_extension%': '<(image_loader_extension)', 957 'image_loader_extension%': '<(image_loader_extension)',
967 'fastbuild%': '<(fastbuild)', 958 'fastbuild%': '<(fastbuild)',
(...skipping 851 matching lines...) Expand 10 before | Expand all | Expand 10 after
1819 }], 1810 }],
1820 ['chromeos==1', { 1811 ['chromeos==1', {
1821 'grit_defines': ['-D', 'chromeos', '-D', 'scale_factors=2x'], 1812 'grit_defines': ['-D', 'chromeos', '-D', 'scale_factors=2x'],
1822 }], 1813 }],
1823 ['desktop_linux==1', { 1814 ['desktop_linux==1', {
1824 'grit_defines': ['-D', 'desktop_linux'], 1815 'grit_defines': ['-D', 'desktop_linux'],
1825 }], 1816 }],
1826 ['toolkit_views==1', { 1817 ['toolkit_views==1', {
1827 'grit_defines': ['-D', 'toolkit_views'], 1818 'grit_defines': ['-D', 'toolkit_views'],
1828 }], 1819 }],
1829 ['toolkit_uses_gtk==1', {
1830 'grit_defines': ['-D', 'toolkit_uses_gtk'],
1831 }],
1832 ['use_aura==1', { 1820 ['use_aura==1', {
1833 'grit_defines': ['-D', 'use_aura'], 1821 'grit_defines': ['-D', 'use_aura'],
1834 }], 1822 }],
1835 ['use_ash==1', { 1823 ['use_ash==1', {
1836 'grit_defines': ['-D', 'use_ash'], 1824 'grit_defines': ['-D', 'use_ash'],
1837 }], 1825 }],
1838 ['use_nss==1', { 1826 ['use_nss==1', {
1839 'grit_defines': ['-D', 'use_nss'], 1827 'grit_defines': ['-D', 'use_nss'],
1840 }], 1828 }],
1841 ['use_ozone==1', { 1829 ['use_ozone==1', {
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
2325 }], 2313 }],
2326 ['use_x11==1', { 2314 ['use_x11==1', {
2327 'defines': ['USE_X11=1'], 2315 'defines': ['USE_X11=1'],
2328 }], 2316 }],
2329 ['use_clipboard_aurax11==1', { 2317 ['use_clipboard_aurax11==1', {
2330 'defines': ['USE_CLIPBOARD_AURAX11=1'], 2318 'defines': ['USE_CLIPBOARD_AURAX11=1'],
2331 }], 2319 }],
2332 ['enable_one_click_signin==1', { 2320 ['enable_one_click_signin==1', {
2333 'defines': ['ENABLE_ONE_CLICK_SIGNIN'], 2321 'defines': ['ENABLE_ONE_CLICK_SIGNIN'],
2334 }], 2322 }],
2335 ['toolkit_uses_gtk==1 and toolkit_views==0', {
2336 # TODO(erg): We are progressively sealing up use of deprecated features
2337 # in gtk in preparation for an eventual porting to gtk3.
2338 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'],
2339 }],
2340 ['chromeos==1', { 2323 ['chromeos==1', {
2341 'defines': ['OS_CHROMEOS=1'], 2324 'defines': ['OS_CHROMEOS=1'],
2342 }], 2325 }],
2343 ['use_xi2_mt!=0 and use_x11==1', { 2326 ['use_xi2_mt!=0 and use_x11==1', {
2344 'defines': ['USE_XI2_MT=<(use_xi2_mt)'], 2327 'defines': ['USE_XI2_MT=<(use_xi2_mt)'],
2345 }], 2328 }],
2346 ['image_loader_extension==1', { 2329 ['image_loader_extension==1', {
2347 'defines': ['IMAGE_LOADER_EXTENSION=1'], 2330 'defines': ['IMAGE_LOADER_EXTENSION=1'],
2348 }], 2331 }],
2349 ['profiling==1', { 2332 ['profiling==1', {
(...skipping 2904 matching lines...) Expand 10 before | Expand all | Expand 10 after
5254 # settings in target dicts. SYMROOT is a special case, because many other 5237 # settings in target dicts. SYMROOT is a special case, because many other
5255 # Xcode variables depend on it, including variables such as 5238 # Xcode variables depend on it, including variables such as
5256 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5239 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5257 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5240 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5258 # files to appear (when present) in the UI as actual files and not red 5241 # files to appear (when present) in the UI as actual files and not red
5259 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5242 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5260 # and therefore SYMROOT, needs to be set at the project level. 5243 # and therefore SYMROOT, needs to be set at the project level.
5261 'SYMROOT': '<(DEPTH)/xcodebuild', 5244 'SYMROOT': '<(DEPTH)/xcodebuild',
5262 }, 5245 },
5263 } 5246 }
OLDNEW
« no previous file with comments | « build/build_config.h ('k') | build/filename_rules.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698