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 /skia/skia_library.gypi | |
| 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 'skia/skia_library.gypi')
| -rw-r--r-- | skia/skia_library.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index 7f6b1bd..6a741fec 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -268,7 +268,7 @@ '../third_party/skia/src/opts/opts_check_SSE2.cpp' ], }], - [ 'use_glib == 1', { + [ 'desktop_linux == 1 or chromeos == 1', { 'dependencies': [ '../build/linux/system.gyp:fontconfig', '../build/linux/system.gyp:freetype2', @@ -280,13 +280,13 @@ '-Wno-unused-function', ], }], - [ 'use_glib == 0', { + [ 'OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', { 'sources!': [ '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp', '../third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp', ], }], - [ 'use_glib == 0 and OS != "android"', { + [ 'OS=="win" or OS=="mac" or OS=="ios"', { 'sources!': [ '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp', |