Auto merge of #25157 - jdm:fontconfig-up, r=asajeffrey

Fix intermittent android build error

Incorporates https://github.com/servo/libfontconfig/pull/42.

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #24715
- [x] There are tests for these changes
This commit is contained in:
bors-servo 2019-12-09 17:21:53 -05:00 committed by GitHub
commit 7a5f936240
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

4
Cargo.lock generated
View file

@ -4757,9 +4757,9 @@ dependencies = [
[[package]]
name = "servo-fontconfig-sys"
version = "4.0.7"
version = "4.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b46d201addcfbd25c1798ad1281d98c40743824e0b0f1e611bd3d5d0d31a7b8d"
checksum = "62b3e166450f523f4db06c14f02a2d39e76d49b5d8cbd224338d93e3595c156c"
dependencies = [
"expat-sys",
"pkg-config",