| Index: ui/ui.gyp
|
| diff --git a/ui/ui.gyp b/ui/ui.gyp
|
| index b167374ff19001b7e1a63551697783d0e2b9f951..69d6393dcead89b27d8f459e87e02e10eb7d8dab 100644
|
| --- a/ui/ui.gyp
|
| +++ b/ui/ui.gyp
|
| @@ -395,6 +395,8 @@
|
| '../build/linux/system.gyp:fontconfig',
|
| '../build/linux/system.gyp:glib',
|
| ],
|
| + }],
|
| + ['desktop_linux == 1 or chromeos == 1', {
|
| 'conditions': [
|
| ['toolkit_views==0 and use_aura==0', {
|
| # Note: because of gyp predence rules this has to be defined as
|
| @@ -412,11 +414,11 @@
|
| ['include', '^base/dragdrop/os_exchange_data.cc'],
|
| ],
|
| }],
|
| - ['use_pango==1', {
|
| - 'dependencies': [
|
| - '../build/linux/system.gyp:pangocairo',
|
| - ],
|
| - }],
|
| + ],
|
| + }],
|
| + ['use_pango==1', {
|
| + 'dependencies': [
|
| + '../build/linux/system.gyp:pangocairo',
|
| ],
|
| }],
|
| ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', {
|
|
|