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

Unified Diff: ui/ui.gyp

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_common.gypi ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index d67d58829972db66c637811a92aa6da78e90f7d1..fe89629543690b60a47968fd83b7a658c0dc6a62 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -582,8 +582,6 @@
['include', '(^|/)ios/'],
['include', '^gfx/'],
['exclude', '^gfx/codec/jpeg_codec\\.cc$'],
- ['exclude', '^gfx/pango_util\\.'],
- ['exclude', '^gfx/platform_font_pango\\.'],
['include', '^base/animation/'],
['include', '^base/l10n/'],
['include', '^base/layout'],
@@ -641,7 +639,12 @@
'base/x/selection_utils.h',
]
}],
-
+ ['use_pango==0', {
+ 'sources/': [
+ ['exclude', '^gfx/pango_util\\.'],
+ ['exclude', '^gfx/platform_font_pango\\.'],
+ ],
+ }],
['use_aura==0 or OS!="linux"', {
'sources!': [
'base/resource/resource_bundle_auralinux.cc',
@@ -662,7 +665,6 @@
# font_gtk.cc uses fontconfig.
'../build/linux/system.gyp:fontconfig',
'../build/linux/system.gyp:glib',
- '../build/linux/system.gyp:pangocairo',
],
'conditions': [
['toolkit_views==0', {
@@ -681,6 +683,11 @@
['include', '^base/dragdrop/os_exchange_data.cc'],
],
}],
+ ['use_pango==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:pangocairo',
+ ],
+ }],
],
}],
['toolkit_uses_gtk == 1', {
@@ -721,10 +728,6 @@
],
'sources!': [
'base/touch/touch_device.cc',
- 'gfx/pango_util.h',
- 'gfx/pango_util.cc',
- 'gfx/platform_font_pango.cc',
- 'gfx/platform_font_pango.h',
],
'include_dirs': [
'../',
@@ -777,10 +780,6 @@
'sources!': [
'base/dragdrop/drag_utils.cc',
'base/dragdrop/drag_utils.h',
- 'gfx/pango_util.h',
- 'gfx/pango_util.cc',
- 'gfx/platform_font_pango.h',
- 'gfx/platform_font_pango.cc',
],
'link_settings': {
'libraries': [
@@ -850,10 +849,6 @@
'base/dragdrop/drag_utils.cc',
'base/dragdrop/drag_utils.h',
'base/touch/touch_device.cc',
- 'gfx/pango_util.cc',
- 'gfx/pango_util.h',
- 'gfx/platform_font_pango.cc',
- 'gfx/platform_font_pango.h',
],
'dependencies': [
'ui_jni_headers',
« no previous file with comments | « content/content_common.gypi ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698