diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 17:37:27 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 17:37:27 +0000 |
| commit | bee345111c70f786315cfa189676f2755fee46eb (patch) | |
| tree | 00673a5eee96903e95f1cc8b396282ff8f4ef152 /skia/skia.gyp | |
| parent | 297c4448c818eb1eaf38ea991fc2dba215513746 (diff) | |
| download | chromium_src-bee345111c70f786315cfa189676f2755fee46eb.zip chromium_src-bee345111c70f786315cfa189676f2755fee46eb.tar.gz chromium_src-bee345111c70f786315cfa189676f2755fee46eb.tar.bz2 | |
Roll Skia DEPS to r9257
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/15882003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201835 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 6806600..79773ec4 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -92,12 +92,12 @@ #'../third_party/skia/src/ports/SkPurgeableMemoryBlock_mac.cpp', '../third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp', - '../third_party/skia/src/ports/FontHostConfiguration_android.cpp', + '../third_party/skia/src/ports/SkFontConfigInterface_android.cpp', #'../third_party/skia/src/ports/SkFontHost_FONTPATH.cpp', '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp', '../third_party/skia/src/ports/SkFontHost_FreeType_common.h', - '../third_party/skia/src/ports/SkFontHost_android.cpp', + '../third_party/skia/src/ports/SkFontConfigParser_android.cpp', #'../third_party/skia/src/ports/SkFontHost_ascender.cpp', #'../third_party/skia/src/ports/SkFontHost_linux.cpp', '../third_party/skia/src/ports/SkFontHost_mac.cpp', @@ -326,7 +326,7 @@ ['exclude', '_android\\.(cc|cpp)$'], ], 'sources!': [ - '../third_party/skia/src/core/SkPaintOptionsAndroid.cpp' + '../third_party/skia/src/core/SkPaintOptionsAndroid.cpp', ], 'defines': [ 'SK_DEFAULT_FONT_CACHE_LIMIT=(20*1024*1024)', @@ -394,6 +394,9 @@ 'sources/': [ ['exclude', '_gtk\\.(cc|cpp)$'] ], }], [ 'OS == "android"', { + 'sources': [ + '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp', + ], 'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'], ], |