diff options
| author | Ben Wagner <bungeman@chromium.org> | 2015-06-17 18:01:35 -0400 |
|---|---|---|
| committer | Ben Wagner <bungeman@chromium.org> | 2015-06-17 22:03:26 +0000 |
| commit | 055e2bd7dc6638376904f5cea25fe5fadcb5790a (patch) | |
| tree | b5cf082f2527cda9bee27fd6148e2dd0cca474bf /skia | |
| parent | 376d313f54f092ea20f52654d716ba5a42597fac (diff) | |
| download | chromium_src-055e2bd7dc6638376904f5cea25fe5fadcb5790a.zip chromium_src-055e2bd7dc6638376904f5cea25fe5fadcb5790a.tar.gz chromium_src-055e2bd7dc6638376904f5cea25fe5fadcb5790a.tar.bz2 | |
Roll src/third_party/skia 0b1de26:77f85ad
Summary of changes available at:
https://chromium.googlesource.com/skia/+log/0b1de26..77f85ad
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=borenet@google.com
Review URL: https://codereview.chromium.org/1178403007.
Cr-Commit-Position: refs/heads/master@{#334935}
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/BUILD.gn | 1 | ||||
| -rw-r--r-- | skia/skia_gn_files.gypi | 1 | ||||
| -rw-r--r-- | skia/skia_library.gypi | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn index bdde0c8..1099b94 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -458,6 +458,7 @@ component("skia") { sources -= [ "//third_party/skia/src/ports/SkFontConfigParser_android.cpp", "//third_party/skia/src/ports/SkFontMgr_android.cpp", + "//third_party/skia/src/ports/SkFontMgr_android_factory.cpp", ] } if (!is_mac) { diff --git a/skia/skia_gn_files.gypi b/skia/skia_gn_files.gypi index ae99261..17b7ec8 100644 --- a/skia/skia_gn_files.gypi +++ b/skia/skia_gn_files.gypi @@ -24,6 +24,7 @@ '<(skia_src_path)/ports/SkFontHost_mac.cpp', '<(skia_src_path)/ports/SkFontHost_win.cpp', '<(skia_src_path)/ports/SkFontMgr_android.cpp', + '<(skia_src_path)/ports/SkFontMgr_android_factory.cpp', '<(skia_src_path)/ports/SkFontMgr_win_dw.cpp', '<(skia_src_path)/ports/SkGlobalInitialization_chromium.cpp', '<(skia_src_path)/ports/SkImageDecoder_empty.cpp', diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index 072c9d5..d950943 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -50,6 +50,7 @@ '../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_win_dw.cpp', '../third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp', '../third_party/skia/src/ports/SkOSFile_posix.cpp', @@ -254,6 +255,10 @@ 'include_dirs': [ '../third_party/expat/files/lib', ], + },{ # not 'OS == "android"' + 'sources!': [ + "../third_party/skia/src/ports/SkFontMgr_android_factory.cpp", + ], }], [ 'OS == "ios"', { 'include_dirs': [ |