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

Unified Diff: chrome/browser/ui/libgtkui/BUILD.gn

Issue 2880223002: Reland: Compile FreeType with HarfBuzz support (Closed)
Patch Set: Fix Android build, and update TestExpectations for linux rebaselines Created 3 years, 7 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 | « build/config/freetype/freetype.gni ('k') | remoting/host/it2me/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtkui/BUILD.gn
diff --git a/chrome/browser/ui/libgtkui/BUILD.gn b/chrome/browser/ui/libgtkui/BUILD.gn
index 4911b889027327e68e2e856dd05bf8820fd069b7..05e5209a2b81438911af8d82c07a75ca14a09419 100644
--- a/chrome/browser/ui/libgtkui/BUILD.gn
+++ b/chrome/browser/ui/libgtkui/BUILD.gn
@@ -99,13 +99,6 @@ template("libgtkui") {
defines = [ "LIBGTKUI_IMPLEMENTATION" ]
- # GTK pulls pangoft2 as dependency, and pangoft2 depends on harfbuzz.
- # To avoid missing indirectly referenced harfbuzz symbols from pango,
- # some hack is required when bundled harfbuzz is used and component build is
- # disabled.
- # See crbug.com/462689 for details.
- all_dependent_configs = [ "//third_party/harfbuzz-ng:pangoft2_link_hack" ]
-
deps = invoker.deps + [
"//base",
"//base:i18n",
@@ -120,6 +113,11 @@ template("libgtkui") {
"//content/public/browser",
"//printing",
"//skia",
+
+ # GTK pulls pangoft2, which requires HarfBuzz symbols. Since we
+ # link our own HarfBuzz, avoid mixing symbols from system HarfBuzz
+ # and own ones, hence the dependency to harfbuzz-ng here.
+ "//third_party/harfbuzz-ng",
Evan Stade 2017/05/15 16:40:07 this looks like something thomasanderson@ knows ab
"//ui/aura",
"//ui/base",
"//ui/base/ime",
« no previous file with comments | « build/config/freetype/freetype.gni ('k') | remoting/host/it2me/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698