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

Unified Diff: build/linux/BUILD.gn

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. 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/linux/BUILD.gn ('k') | build/linux/system.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/BUILD.gn
diff --git a/build/linux/BUILD.gn b/build/linux/BUILD.gn
index 6a1939dd15b933f40123dd6992facfddc3ccb976..97428b4eda155cdb87cc70d91ab057c3f23eefb5 100644
--- a/build/linux/BUILD.gn
+++ b/build/linux/BUILD.gn
@@ -11,8 +11,6 @@ gypi_values = exec_script("//build/gypi_to_gn.py",
"scope",
[ "system.gyp" ])
-use_system_fontconfig = !is_chromecast
-
# If brlapi isn't needed, don't require it to be installed.
if (use_brlapi) {
config("brlapi_config") {
@@ -107,11 +105,24 @@ group("udev") {
}
group("fontconfig") {
- if (use_system_fontconfig) {
- public_configs = [ "//build/config/linux:fontconfig" ]
- } else {
+ if (is_chromecast) {
+ # Chromecast platform does not provide fontconfig
public_deps = [
"//third_party/fontconfig",
]
+ } else {
+ public_configs = [ "//build/config/linux:fontconfig" ]
+ }
+}
+
+group("freetype2") {
+ if (is_chromecast) {
+ # Chromecast platform doesn't provide freetype, so use Chromium's.
+ # The version in freetype-android is unmodified from freetype2 upstream.
+ public_deps = [
+ "//third_party/freetype-android:freetype",
+ ]
+ } else {
+ public_configs = [ "//build/config/linux:freetype2" ]
}
}
« no previous file with comments | « build/config/linux/BUILD.gn ('k') | build/linux/system.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698