diff options
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia_common.gypi | 2 | ||||
| -rw-r--r-- | skia/skia_library.gypi | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/skia/skia_common.gypi b/skia/skia_common.gypi index 03eade8..628c474 100644 --- a/skia/skia_common.gypi +++ b/skia/skia_common.gypi @@ -29,7 +29,7 @@ [ 'OS != "win"', { 'sources/': [ ['exclude', '_win\\.(cc|cpp)$'] ], }], - [ 'use_glib == 0', { + [ 'desktop_linux == 0 and chromeos == 0', { 'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ], }], ], 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', |