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

Unified Diff: content/common/BUILD.gn

Issue 2278143002: Filter font list, use Fontconfig and build on Ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Copyright line fixed Created 4 years, 4 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 | « no previous file | content/common/font_list_fontconfig.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/BUILD.gn
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 3e9cdd60b8ddfcf66ae4af90e44155b1a62804b7..7b5db9e46e170d838320144a8cbb1fa8abb247c6 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -143,10 +143,7 @@ source_set("common") {
if (use_ozone) {
deps += [ "//ui/ozone" ]
} else {
- sources -= [
- "cursors/webcursor_ozone.cc",
- "font_list_ozone.cc",
- ]
+ sources -= [ "cursors/webcursor_ozone.cc" ]
}
if (!use_aura || is_android) {
@@ -157,15 +154,12 @@ source_set("common") {
sources -= [ "cursors/webcursor_aurax11.cc" ]
}
- if (use_pango) {
- configs += [ "//build/config/linux/pangocairo" ]
- if (use_ozone) {
- # If we're using pango, never use this ozone file (it was removed in all
- # non-ozone cases above).
- sources -= [ "font_list_ozone.cc" ]
- }
- } else {
- sources -= [ "font_list_pango.cc" ]
+ if (is_linux) {
+ deps += [ "//build/linux:fontconfig" ]
+ }
+
+ if (is_mac || is_win || is_android) {
+ sources -= [ "font_list_fontconfig.cc" ]
}
if (enable_plugins) {
« no previous file with comments | « no previous file | content/common/font_list_fontconfig.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698