| 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',
|
|
|