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

Unified Diff: skia/skia_library.gypi

Issue 1685053002: blink fonts: Load Android SkFontMgr on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@windows_change
Patch Set: Rebase. Created 4 years, 10 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: skia/skia_library.gypi
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi
index e5cfea659b09f7110b545211e44e890089bd0bf2..a706a656d6253144e95d249a6ee864f6a0b97e9c 100644
--- a/skia/skia_library.gypi
+++ b/skia/skia_library.gypi
@@ -162,6 +162,7 @@
'dependencies': [
'../build/linux/system.gyp:fontconfig',
'../build/linux/system.gyp:freetype2',
+ '../third_party/expat/expat.gyp:expat',
'../third_party/icu/icu.gyp:icuuc',
],
'cflags': [
@@ -294,6 +295,14 @@
],
},
}],
+ # Add the files for the SkFontMgr_Android. This is used to emulate android
+ # fonts on linux. See content/zygote/zygote_main_linux.cc
+ [ 'OS == "linux"', {
+ 'sources/': [
+ ['include', 'SkFontMgr_android\\.cpp$',],
+ ['include', 'SkFontMgr_android_parser\\.cpp$',],
+ ],
+ }],
],
'direct_dependent_settings': {

Powered by Google App Engine
This is Rietveld 408576698