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

Unified Diff: remoting/host/it2me/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
Index: remoting/host/it2me/BUILD.gn
diff --git a/remoting/host/it2me/BUILD.gn b/remoting/host/it2me/BUILD.gn
index 0908c7496cdd3a11d61d17a2b6221c6b66d548fb..497e1f64e325229894d61c35b659ab01d6a69a53 100644
--- a/remoting/host/it2me/BUILD.gn
+++ b/remoting/host/it2me/BUILD.gn
@@ -52,13 +52,14 @@ source_set("common") {
]
if (is_desktop_linux) {
- # GTK2 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 += [ "//build/config/linux/gtk" ]
+ deps += [
+ "//build/config/linux/gtk",
+
+ # 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",
+ ]
}
}

Powered by Google App Engine
This is Rietveld 408576698