Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Dynamically link against system fontconfig #40725

Merged
merged 3 commits into from
May 25, 2023
Merged

Dynamically link against system fontconfig #40725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b3c765
Remove no longer used FLUTTER_USE_FONTCONFIG define
vially Mar 26, 2023
4b111ad
Dynamically link against system fontconfig
vially Mar 28, 2023
e33a29a
Roll buildroot to e522d38d629d7522f0589e754886ed2b82232d9e
cbracken May 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'aee1094b10465e32972932e23b6799c3f8de244f',
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'e522d38d629d7522f0589e754886ed2b82232d9e',

# Fuchsia compatibility
#
Expand Down
8 changes: 2 additions & 6 deletions third_party/txt/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ config("allow_posix_names") {
}

source_set("txt") {
defines = []
if (flutter_use_fontconfig) {
defines += [ "FLUTTER_USE_FONTCONFIG" ]
}

sources = [
"src/skia/paragraph_builder_skia.cc",
"src/skia/paragraph_builder_skia.h",
Expand Down Expand Up @@ -96,8 +91,9 @@ source_set("txt") {
"//third_party/skia/modules/skparagraph",
]

libs = []
if (flutter_use_fontconfig) {
deps += [ "//third_party/fontconfig" ]
libs += [ "fontconfig" ]
}

if (is_mac || is_ios) {
Expand Down