aboutsummaryrefslogtreecommitdiffhomepage
path: root/BUILD.gn
diff options
context:
space:
mode:
authorGravatar Ben Wagner <bungeman@google.com>2017-02-23 20:48:43 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-02-23 20:48:53 +0000
commit97043299cb352f50f604878b7a1dc8ad127fc1c6 (patch)
tree3363bfc674ab808e735336898386076d9c3b9558 /BUILD.gn
parent3f81f3703a68755c88f5cc4a87728b98f34c4cd4 (diff)
Revert "Add SkTypeface::getVariationDesignPosition."
This reverts commit 0f3d0c37dbcaf4ec271d5fe847becc9b1aa6f537. Reason for revert: <INSERT REASONING HERE> Original change's description: > Add SkTypeface::getVariationDesignPosition. > > Allow users to query a typeface's position in variation design space. > > Change-Id: I173ee9eefdddee6b2613435ebcc6b08c25b382ed > Reviewed-on: https://skia-review.googlesource.com/8684 > 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: I484fe52c1f89e7b6d0024dcabf7c59d0e8b5b5e7 Reviewed-on: https://skia-review.googlesource.com/8929 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 e8d24db8b3..af188f8acc 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -335,8 +335,8 @@ optional("fontmgr_android") {
enabled = fontmgr_android_enabled
deps = [
- ":typeface_freetype",
"//third_party/expat",
+ "//third_party/freetype2",
]
sources = [
"src/ports/SkFontMgr_android.cpp",
@@ -349,7 +349,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",
@@ -365,8 +365,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",
@@ -382,7 +382,7 @@ optional("fontmgr_fuchsia") {
enabled = is_fuchsia && skia_use_freetype
deps = [
- ":typeface_freetype",
+ "//third_party/freetype2",
]
sources = [
"src/ports/SkFontMgr_custom.cpp",
@@ -581,6 +581,7 @@ component("skia") {
":sse41",
":sse42",
":ssse3",
+ ":typeface_freetype",
":webp",
":xml",
]