summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
Diffstat (limited to 'skia')
-rw-r--r--skia/skia.gyp8
1 files changed, 7 insertions, 1 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp
index cfec687..aa141cf 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -363,6 +363,8 @@
'../third_party/skia/src/gpu/GrBufferAllocPool.cpp',
'../third_party/skia/src/gpu/GrBufferAllocPool.h',
'../third_party/skia/src/gpu/GrClip.cpp',
+ '../third_party/skia/src/gpu/GrClipMaskManager.cpp',
+ '../third_party/skia/src/gpu/GrClipMaskManager.h',
'../third_party/skia/src/gpu/GrContext.cpp',
'../third_party/skia/src/gpu/GrDefaultPathRenderer.cpp',
'../third_party/skia/src/gpu/GrDefaultPathRenderer.h',
@@ -845,7 +847,6 @@
'../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_tables.cpp',
],
}],
[ 'OS == "android"', {
@@ -931,6 +932,11 @@
'sources': [
'../third_party/skia/src/utils/mac/SkStream_mac.cpp',
],
+ 'sources!': [
+ # The mac's fonthost implements the table methods natively,
+ # so no need for these generic versions.
+ '../third_party/skia/src/ports/SkFontHost_tables.cpp',
+ ],
'conditions': [
[ 'use_skia == 0', {
'sources/': [