diff options
| author | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 06:24:58 +0000 |
|---|---|---|
| committer | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 06:24:58 +0000 |
| commit | b098e1d8b492803cbb2857f684fdc34460fdc9e1 (patch) | |
| tree | 7de9031c71d55386d79c16992c7e892e07ea81f5 /ui/ui.gyp | |
| parent | c2901e4ac9bf4f936dc5c7062112031ddb735b74 (diff) | |
| download | chromium_src-b098e1d8b492803cbb2857f684fdc34460fdc9e1.zip chromium_src-b098e1d8b492803cbb2857f684fdc34460fdc9e1.tar.gz chromium_src-b098e1d8b492803cbb2857f684fdc34460fdc9e1.tar.bz2 | |
Clean up uses of use_glib that are not related to glib dependencies
We're frequently using the use_glib gyp variable as a shorthand for:
OS!="win" and OS!="mac" and OS!="ios" and OS!="android"
This should be equivalent to:
desktop_linux == 1 or chromeos == 1
Embedded builds want to remove as many dependencies as possible. This
cleans up uses of the use_glib variable so we can turn it off on linux
without breaking the build.
BUG=316226
Review URL: https://codereview.chromium.org/61923004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
| -rw-r--r-- | ui/ui.gyp | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -402,6 +402,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 @@ -419,11 +421,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)', { |