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

Side by Side Diff: build/common.gypi

Issue 15102010: untangle pango usage from use_x11 and OS==linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove stray unit test inclusion (bad rebase?) 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
« no previous file with comments | « no previous file | content/common/font_list_linux.cc » ('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 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 'use_nss%': 0, 438 'use_nss%': 0,
439 }], 439 }],
440 440
441 # Flags to use X11 on non-Mac POSIX platforms. 441 # Flags to use X11 on non-Mac POSIX platforms.
442 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_ozone==1', { 442 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_ozone==1', {
443 'use_x11%': 0, 443 'use_x11%': 0,
444 }, { 444 }, {
445 'use_x11%': 1, 445 'use_x11%': 1,
446 }], 446 }],
447 447
448 # Flags to use glib on non-Mac POSIX platforms. 448 # Flags to use pango and glib on non-Mac POSIX platforms.
449 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', { 449 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', {
450 'use_glib%': 0, 450 'use_glib%': 0,
451 'use_pango%': 0,
451 }, { 452 }, {
452 'use_glib%': 1, 453 'use_glib%': 1,
454 'use_pango%': 1,
453 }], 455 }],
454 456
455 # We always use skia text rendering in Aura on Windows, since GDI 457 # We always use skia text rendering in Aura on Windows, since GDI
456 # doesn't agree with our BackingStore. 458 # doesn't agree with our BackingStore.
457 # TODO(beng): remove once skia text rendering is on by default. 459 # TODO(beng): remove once skia text rendering is on by default.
458 ['use_aura==1 and OS=="win"', { 460 ['use_aura==1 and OS=="win"', {
459 'enable_skia_text%': 1, 461 'enable_skia_text%': 1,
460 }], 462 }],
461 463
462 # A flag to enable or disable our compile-time dependency 464 # A flag to enable or disable our compile-time dependency
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 'host_arch%': '<(host_arch)', 730 'host_arch%': '<(host_arch)',
729 'toolkit_views%': '<(toolkit_views)', 731 'toolkit_views%': '<(toolkit_views)',
730 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 732 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
731 'use_aura%': '<(use_aura)', 733 'use_aura%': '<(use_aura)',
732 'use_ash%': '<(use_ash)', 734 'use_ash%': '<(use_ash)',
733 'use_openssl%': '<(use_openssl)', 735 'use_openssl%': '<(use_openssl)',
734 'use_nss%': '<(use_nss)', 736 'use_nss%': '<(use_nss)',
735 'os_bsd%': '<(os_bsd)', 737 'os_bsd%': '<(os_bsd)',
736 'os_posix%': '<(os_posix)', 738 'os_posix%': '<(os_posix)',
737 'use_glib%': '<(use_glib)', 739 'use_glib%': '<(use_glib)',
740 'use_pango%': '<(use_pango)',
738 'use_ozone%': '<(use_ozone)', 741 'use_ozone%': '<(use_ozone)',
739 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 742 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
740 'use_x11%': '<(use_x11)', 743 'use_x11%': '<(use_x11)',
741 'use_gnome_keyring%': '<(use_gnome_keyring)', 744 'use_gnome_keyring%': '<(use_gnome_keyring)',
742 'linux_fpic%': '<(linux_fpic)', 745 'linux_fpic%': '<(linux_fpic)',
743 'chromeos%': '<(chromeos)', 746 'chromeos%': '<(chromeos)',
744 'enable_viewport%': '<(enable_viewport)', 747 'enable_viewport%': '<(enable_viewport)',
745 'enable_hidpi%': '<(enable_hidpi)', 748 'enable_hidpi%': '<(enable_hidpi)',
746 'enable_touch_ui%': '<(enable_touch_ui)', 749 'enable_touch_ui%': '<(enable_touch_ui)',
747 'use_xi2_mt%':'<(use_xi2_mt)', 750 'use_xi2_mt%':'<(use_xi2_mt)',
(...skipping 3692 matching lines...) Expand 10 before | Expand all | Expand 10 after
4440 # settings in target dicts. SYMROOT is a special case, because many other 4443 # settings in target dicts. SYMROOT is a special case, because many other
4441 # Xcode variables depend on it, including variables such as 4444 # Xcode variables depend on it, including variables such as
4442 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4445 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4443 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4446 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4444 # files to appear (when present) in the UI as actual files and not red 4447 # files to appear (when present) in the UI as actual files and not red
4445 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4448 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4446 # and therefore SYMROOT, needs to be set at the project level. 4449 # and therefore SYMROOT, needs to be set at the project level.
4447 'SYMROOT': '<(DEPTH)/xcodebuild', 4450 'SYMROOT': '<(DEPTH)/xcodebuild',
4448 }, 4451 },
4449 } 4452 }
OLDNEW
« no previous file with comments | « no previous file | content/common/font_list_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698