| Index: content/content_common.gypi
|
| diff --git a/content/content_common.gypi b/content/content_common.gypi
|
| index 4bbba88a135554141b843b9a077a1f73fb94eec6..8d0968845dd443bd7c9792d9f6ff0d4a7d00a3aa 100644
|
| --- a/content/content_common.gypi
|
| +++ b/content/content_common.gypi
|
| @@ -195,8 +195,8 @@
|
| 'common/font_list.cc',
|
| 'common/font_list.h',
|
| 'common/font_list_android.cc',
|
| - 'common/font_list_linux.cc',
|
| 'common/font_list_mac.mm',
|
| + 'common/font_list_pango.cc',
|
| 'common/font_list_win.cc',
|
| 'common/gamepad_hardware_buffer.h',
|
| 'common/gamepad_messages.h',
|
| @@ -453,9 +453,6 @@
|
| ],
|
| }],
|
| ['use_x11 == 1', {
|
| - 'dependencies': [
|
| - '../build/linux/system.gyp:pangocairo',
|
| - ],
|
| 'include_dirs': [
|
| '<(DEPTH)/third_party/angle/include',
|
| ],
|
| @@ -465,6 +462,15 @@
|
| ],
|
| },
|
| }],
|
| + ['use_pango == 1', {
|
| + 'dependencies': [
|
| + '../build/linux/system.gyp:pangocairo',
|
| + ],
|
| + }, { # use_pango == 0
|
| + 'sources!': [
|
| + 'common/font_list_pango.cc',
|
| + ],
|
| + }],
|
| ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', {
|
| 'sources': [
|
| 'common/gpu/x_util.cc',
|
|
|