Chromium Code Reviews

Unified Diff: third_party/freetype-android/freetype.gyp

Issue 1627533002: [Chromecast] Depend on Chromium's freetype-android (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Remove use_system_fontconfig flag from build/linux/BUILD.gn Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « third_party/freetype-android/README.chromium ('k') | third_party/harfbuzz-ng/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/freetype-android/freetype.gyp
diff --git a/third_party/freetype-android/freetype.gyp b/third_party/freetype-android/freetype.gyp
index 169f132f1fa667bd646104447343db781ed6a616..c5ee3e13e41a9f830c4642be4a253947c566d8a8 100644
--- a/third_party/freetype-android/freetype.gyp
+++ b/third_party/freetype-android/freetype.gyp
@@ -7,12 +7,11 @@
'ft2_dir': 'src',
},
'conditions': [
- [ 'OS == "android"', {
+ [ 'OS=="android" or chromecast==1', {
'targets': [
{
'target_name': 'ft2',
'type': 'static_library',
- 'toolsets': ['target'],
'sources': [
# The following files are not sorted alphabetically, but in the
# same order as in Android.mk to ease maintenance.
@@ -60,6 +59,13 @@
'<(ft2_dir)/include',
],
},
+ 'conditions': [
+ ['OS=="android"', {
+ 'toolsets': ['target'],
+ }, 'chromecast==1', {
+ 'sources': [ '<(ft2_dir)/src/base/ftbdf.c', ],
+ }]
+ ],
},
],
}],
« no previous file with comments | « third_party/freetype-android/README.chromium ('k') | third_party/harfbuzz-ng/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine