diff options
| author | bungeman <bungeman@chromium.org> | 2015-06-23 18:58:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-24 01:58:43 +0000 |
| commit | 709687908f11ff99d0120bec350bfb227fbc5bfe (patch) | |
| tree | 5fac06cc4204fa9c7821b90c4d7115271866b8fc /skia/skia_library.gypi | |
| parent | 6f2063ea9711e80b6676d7372c83657d13f8205f (diff) | |
| download | chromium_src-709687908f11ff99d0120bec350bfb227fbc5bfe.zip chromium_src-709687908f11ff99d0120bec350bfb227fbc5bfe.tar.gz chromium_src-709687908f11ff99d0120bec350bfb227fbc5bfe.tar.bz2 | |
Roll src/third_party/skia b607767:74f681d
Summary of changes available at:
https://chromium.googlesource.com/skia/+log/b607767..74f681d
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=fmalita@google.com
Review URL: https://codereview.chromium.org/1200413002
Cr-Commit-Position: refs/heads/master@{#335854}
Diffstat (limited to 'skia/skia_library.gypi')
| -rw-r--r-- | skia/skia_library.gypi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index d950943..ee7050b 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -46,11 +46,11 @@ '../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/SkFontConfigParser_android.cpp', '../third_party/skia/src/ports/SkFontHost_mac.cpp', '../third_party/skia/src/ports/SkFontHost_win.cpp', "../third_party/skia/src/ports/SkFontMgr_android.cpp", "../third_party/skia/src/ports/SkFontMgr_android_factory.cpp", + '../third_party/skia/src/ports/SkFontMgr_android_parser.cpp', '../third_party/skia/src/ports/SkFontMgr_win_dw.cpp', '../third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp', '../third_party/skia/src/ports/SkOSFile_posix.cpp', @@ -258,6 +258,7 @@ },{ # not 'OS == "android"' 'sources!': [ "../third_party/skia/src/ports/SkFontMgr_android_factory.cpp", + '../third_party/skia/src/ports/SkFontMgr_android_parser.cpp', ], }], [ 'OS == "ios"', { |