| Index: skia/skia.gyp
|
| diff --git a/skia/skia.gyp b/skia/skia.gyp
|
| index 0e203ed97999494e56953e1c7deb7a4e6d4fdbf1..fe56e29d6e64dfa1fff6b5fca2107f6ad5cf3eb0 100644
|
| --- a/skia/skia.gyp
|
| +++ b/skia/skia.gyp
|
| @@ -723,7 +723,7 @@
|
| ['exclude', '_mac\\.(cc|cpp|mm?)$'],
|
| ['exclude', '/mac/'] ],
|
| }],
|
| - [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"', {
|
| + [ 'toolkit_uses_gtk == 0', {
|
| 'sources/': [ ['exclude', '_(linux|gtk)\\.(cc|cpp)$'] ],
|
| 'sources!': [
|
| '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
|
| @@ -759,7 +759,7 @@
|
| 'SK_RESTRICT=',
|
| ],
|
| }],
|
| - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
|
| + [ 'toolkit_uses_gtk == 1', {
|
| 'dependencies': [
|
| '../build/linux/system.gyp:gdk',
|
| '../build/linux/system.gyp:fontconfig',
|
| @@ -891,7 +891,7 @@
|
| '../third_party/skia/src/core',
|
| ],
|
| 'conditions': [
|
| - [ '(OS == "linux" or OS == "freebsd" or OS == "openbsd") and target_arch != "arm"', {
|
| + [ 'os_posix == 1 and OS != "mac" and target_arch != "arm"', {
|
| 'cflags': [
|
| '-msse2',
|
| ],
|
|
|