Use our own freetype2 (from //third_party) on Linux and FNL.
Possibly we should do the same for Android (instead of "our own copy",
from //third_party/freetype-android), to be investigated separately.
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/1528173003 .
diff --git a/build/config/fnl/BUILD.gn b/build/config/fnl/BUILD.gn
index 379c5dc..e1d8e86 100644
--- a/build/config/fnl/BUILD.gn
+++ b/build/config/fnl/BUILD.gn
@@ -27,8 +27,3 @@
defines += [ "MESA_EGL_NO_X11_HEADERS" ]
}
}
-
-config("freetype2") {
- include_dirs = [ "$sysroot/usr/include/freetype2" ]
- libs = [ "freetype" ]
-}
diff --git a/build/config/linux/BUILD.gn b/build/config/linux/BUILD.gn
index ebdf6e7..77447a6 100644
--- a/build/config/linux/BUILD.gn
+++ b/build/config/linux/BUILD.gn
@@ -29,11 +29,6 @@
}
}
-config("freetype2") {
- include_dirs = [ "$sysroot/usr/include/freetype2" ]
- libs = [ "freetype" ]
-}
-
config("x11") {
libs = [
"X11",
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index ebc3f09..65f1dbd 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -442,8 +442,10 @@
]
if (is_linux) {
- configs += [ "//build/config/linux:freetype2" ]
- deps += [ "//third_party/icu:icuuc" ]
+ deps += [
+ "//third_party/freetype2",
+ "//third_party/icu:icuuc",
+ ]
}
if (is_android) {
