| Index: ui/ui_unittests.gyp
|
| diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp
|
| index cfe3d9d6cf5cec216c75ead02dfb7c3a9134f968..222947ae0ea07b4ed53d8228234c9ad01358a848 100644
|
| --- a/ui/ui_unittests.gyp
|
| +++ b/ui/ui_unittests.gyp
|
| @@ -40,11 +40,7 @@
|
| 'base/resource/data_pack_unittest.cc',
|
| 'base/resource/resource_bundle_unittest.cc',
|
| 'base/test/run_all_unittests.cc',
|
| - 'gfx/font_unittest.cc',
|
| - 'gfx/image/image_skia_unittest.cc',
|
| 'gfx/screen_unittest.cc',
|
| - 'gfx/text_elider_unittest.cc',
|
| - 'gfx/text_utils_unittest.cc',
|
| ],
|
| 'all_sources': [
|
| '<@(_common_sources)',
|
| @@ -142,12 +138,8 @@
|
| }],
|
| ['use_pango == 1', {
|
| 'dependencies': [
|
| - '../build/linux/system.gyp:fontconfig',
|
| '../build/linux/system.gyp:pangocairo',
|
| ],
|
| - 'sources': [
|
| - 'gfx/platform_font_pango_unittest.cc',
|
| - ],
|
| 'conditions': [
|
| ['use_allocator!="none"', {
|
| 'dependencies': [
|
| @@ -208,11 +200,9 @@
|
| }],
|
| ['use_ozone==1 and use_pango==0', {
|
| 'sources!': [
|
| - 'gfx/text_elider_unittest.cc',
|
| - 'gfx/font_unittest.cc',
|
| + 'gfx/canvas_unittest.cc',
|
| 'gfx/font_list_unittest.cc',
|
| 'gfx/render_text_unittest.cc',
|
| - 'gfx/canvas_unittest.cc',
|
| ],
|
| }],
|
| ['chromeos==1', {
|
|
|