diff options
author | Ben Wagner <bungeman@google.com> | 2018-06-22 21:11:00 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-22 21:12:58 +0000 |
commit | 37a06c063c9a9bb53f8840e8304706c3ff7fe141 (patch) | |
tree | ce2991d52dbb5d45024928968cd52391a7095f6c /BUILD.gn | |
parent | cce82d2b7c6ce3addd72016191e1be73bc084953 (diff) |
Reland "Implement onMakeClone(const SkFontArguments& args) in class SkTypeface_fontconfig."
This reverts commit cce82d2b7c6ce3addd72016191e1be73bc084953.
Reason for revert: Just add suppression.
Original change's description:
> Revert "Implement onMakeClone(const SkFontArguments& args) in class SkTypeface_fontconfig."
>
> This reverts commit 96b1ecc25d00a3d52dcc51a788b0df0acdd1dad9.
>
> Reason for revert: Breaking Google3, I think
>
> Original change's description:
> > Implement onMakeClone(const SkFontArguments& args) in class SkTypeface_fontconfig.
> >
> > Create FontMgrFontConfigTest.cpp file to test the above function.
> >
> > Change-Id: I7716355f702af3d6f25574305914f0b82a4147ce
> > Reviewed-on: https://skia-review.googlesource.com/137133
> > Reviewed-by: Ben Wagner <bungeman@google.com>
> > Commit-Queue: Ben Wagner <bungeman@google.com>
>
> TBR=bungeman@google.com,herb@google.com,brucewang@google.com
>
> Change-Id: I665de46d379f1b533358f0be644814aa4bfffb33
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/137240
> Reviewed-by: Kevin Lubick <kjlubick@google.com>
> Commit-Queue: Kevin Lubick <kjlubick@google.com>
TBR=bungeman@google.com,herb@google.com,kjlubick@google.com,brucewang@google.com
Change-Id: I41f0e4505ed0579a77a56212898e9a6caf6f1ed5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/137260
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'BUILD.gn')
-rw-r--r-- | BUILD.gn | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1390,6 +1390,9 @@ if (skia_enable_tools) { if (!fontmgr_android_enabled) { sources -= [ "//tests/FontMgrAndroidParserTest.cpp" ] } + if (!(skia_use_freetype && skia_use_fontconfig)) { + sources -= [ "//tests/FontMgrFontConfigTest.cpp" ] + } deps = [ ":experimental_svg_model", ":flags", |