aboutsummaryrefslogtreecommitdiffhomepage
path: root/BUILD.gn
diff options
context:
space:
mode:
authorGravatar Ben Wagner <bungeman@google.com>2017-02-17 18:38:52 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-02-17 18:39:09 +0000
commit7d07d4663822c05e421f1f50460a985ab43adac4 (patch)
tree708aca529955646b35468d4364dd75517765ad9a /BUILD.gn
parent87e7f820f74a990a59fb8f1d5c182584ce586ecf (diff)
Revert "Add SkTypeface::getVariationDesignPosition."
This reverts commit 87e7f820f74a990a59fb8f1d5c182584ce586ecf. Reason for revert: Failed a test on Mac Original change's description: > Add SkTypeface::getVariationDesignPosition. > > Allow users to query a typeface's position in variation design space. > > Change-Id: I5d80c8ff658708a5d1aa386ec5b7396dcb621198 > Reviewed-on: https://skia-review.googlesource.com/7130 > Commit-Queue: Ben Wagner <bungeman@google.com> > Reviewed-by: Mike Reed <reed@google.com> > TBR=bungeman@google.com,reed@google.com,reviews@skia.org,drott@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ia65792083642dbe9333a62eb75d162931b57cffd Reviewed-on: https://skia-review.googlesource.com/8670 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'BUILD.gn')
-rw-r--r--BUILD.gn9
1 files changed, 5 insertions, 4 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 3e4f2eb617..a442ccef57 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -333,8 +333,8 @@ optional("fontmgr_android") {
enabled = fontmgr_android_enabled
deps = [
- ":typeface_freetype",
"//third_party/expat",
+ "//third_party/freetype2",
]
sources = [
"src/ports/SkFontMgr_android.cpp",
@@ -347,7 +347,7 @@ optional("fontmgr_custom") {
enabled = is_linux && skia_use_freetype && !skia_use_fontconfig
deps = [
- ":typeface_freetype",
+ "//third_party/freetype2",
]
sources = [
"src/ports/SkFontMgr_custom.cpp",
@@ -363,8 +363,8 @@ optional("fontmgr_fontconfig") {
enabled = skia_use_freetype && skia_use_fontconfig
deps = [
- ":typeface_freetype",
"//third_party:fontconfig",
+ "//third_party/freetype2",
]
sources = [
"src/ports/SkFontConfigInterface.cpp",
@@ -380,7 +380,7 @@ optional("fontmgr_fuchsia") {
enabled = is_fuchsia && skia_use_freetype
deps = [
- ":typeface_freetype",
+ "//third_party/freetype2",
]
sources = [
"src/ports/SkFontMgr_custom.cpp",
@@ -571,6 +571,7 @@ component("skia") {
":sse41",
":sse42",
":ssse3",
+ ":typeface_freetype",
":webp",
":xml",
]