diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 03:39:09 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 03:39:09 +0000 |
| commit | b53d0f29c8f85db1ace3a052a70eece6b64bdd30 (patch) | |
| tree | 4c1d077234adb1926c43a5b3c879230cd4195486 /skia | |
| parent | af754e1a83b826e7f28162212c8a4ce3980493f8 (diff) | |
| download | chromium_src-b53d0f29c8f85db1ace3a052a70eece6b64bdd30.zip chromium_src-b53d0f29c8f85db1ace3a052a70eece6b64bdd30.tar.gz chromium_src-b53d0f29c8f85db1ace3a052a70eece6b64bdd30.tar.bz2 | |
aura: Make 'skia' target build and link without gtk.
Depends on http://codereview.chromium.org/7904034/
BUG=97131
TEST=none
Review URL: http://codereview.chromium.org/7963001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index daecaae..f116523 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -743,16 +743,6 @@ '../third_party/skia/src/utils/SkMatrix44.cpp', ], }], - [ 'toolkit_uses_gtk == 0', { - 'sources/': [ ['exclude', '_(linux|gtk)\\.(cc|cpp)$'] ], - 'sources!': [ - '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', - '../third_party/skia/src/ports/SkFontHost_TryeType_Tables.cpp', - '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp', - '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp', - '../third_party/skia/src/ports/SkFontHost_tables.cpp', - ], - }], [ 'OS == "android"', { 'sources/': [ ['include', 'ext/platform_device_linux.cc'], @@ -779,9 +769,8 @@ '../third_party/skia/src/opts/opts_check_SSE2.cpp' ], }], - [ 'toolkit_uses_gtk == 1', { + [ 'use_glib == 1', { 'dependencies': [ - '../build/linux/system.gyp:gdk', '../build/linux/system.gyp:fontconfig', '../build/linux/system.gyp:freetype2', '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz', @@ -798,6 +787,22 @@ 'defines': [ 'SK_MAX_SIZE_FOR_LCDTEXT=256', ], + }, { # use_glib == 0 + 'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ], + 'sources!': [ + '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', + '../third_party/skia/src/ports/SkFontHost_TryeType_Tables.cpp', + '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp', + '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp', + '../third_party/skia/src/ports/SkFontHost_tables.cpp', + ], + }], + [ 'toolkit_uses_gtk == 1', { + 'dependencies': [ + '../build/linux/system.gyp:gdk', + ], + }, { # toolkit_uses_gtk == 0 + 'sources/': [ ['exclude', '_gtk\\.(cc|cpp)$'] ], }], [ 'OS == "mac"', { 'defines': [ |