From 51f89048d6bda8b7f587c5da9518fb192ae7ebc1 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 8 Mar 2018 06:08:18 +0000 Subject: [PATCH] Use bundled freetype from Chromium --- brightray/brightray.gyp | 9 --------- vendor/libchromiumcontent | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index ebd043845f4f..d72fcfba3808 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -161,7 +161,6 @@ '-ldl', '-lresolv', '-lfontconfig', - '-lfreetype', '-lexpat', ], }, @@ -173,14 +172,6 @@ ], }, }], - # On ARM64 libchromiumcontent always links to system libfreetype - ['target_arch=="arm64"', { - 'link_settings': { - 'libraries': [ - '-lfreetype', - ], - }, - }], ], }], # OS=="linux" ['OS=="mac"', { diff --git a/vendor/libchromiumcontent b/vendor/libchromiumcontent index 8c526e52d02a..f0d7c2dc0d44 160000 --- a/vendor/libchromiumcontent +++ b/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit 8c526e52d02a574b6d3cbaf2014cdccb9a0e3185 +Subproject commit f0d7c2dc0d44960069a2d8b0a9f7c5722ceeb259