Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Unified Diff: build/linux/BUILD.gn

Issue 2300973002: NOT FOR LANDING Update FreeType to upstream 57a6733dcf7828fe3db9254edab33fda7c9f6a10. (Closed)
Patch Set: Rebase, see trybot results again Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « DEPS ('k') | third_party/freetype2/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/BUILD.gn
diff --git a/build/linux/BUILD.gn b/build/linux/BUILD.gn
index 410f832a4660c29e2fdc33a2440cf58c67c7a07b..bf8562601ca503cc6011fcd85fcad05f8e300a52 100644
--- a/build/linux/BUILD.gn
+++ b/build/linux/BUILD.gn
@@ -48,21 +48,12 @@ group("fontconfig") {
}
}
-if (!is_chromecast) {
- pkg_config("freetype2_config") {
- visibility = [ ":freetype2" ]
- packages = [ "freetype2" ]
- }
-}
-
group("freetype2") {
- if (is_chromecast) {
- # Chromecast platform doesn't provide freetype, so use Chromium's.
- # The version in freetype-android is unmodified from freetype2 upstream.
- public_deps = [
- "//third_party/freetype-android:freetype",
- ]
- } else {
- public_configs = [ ":freetype2_config" ]
- }
+ # We need to track upstream FreeType closesly for variable fonts support,
+ # see crbug.com/274030 and the blocked bug for details. This also benefits
+ # color emoji on systems with older system FreeType. Chromecast platform
+ # doesn't provide freetype, so use Chromium's.
+ public_deps = [
+ "//third_party/freetype2",
+ ]
}
« no previous file with comments | « DEPS ('k') | third_party/freetype2/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698