From 522fd1e551b266707719730674c0c1e0df4a69ea Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Sun, 26 Jul 2020 00:05:28 -0400 Subject: [PATCH] Fix SkottieKit font loading The current build configuration (empty fontmgr) doesn't support loading custom fonts. For full/npm builds, use the custom fontmgr. Change-Id: Ifd623fdbac2d5723a04add6fc455188fb3dc96e1 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305816 Commit-Queue: Kevin Lubick Reviewed-by: Kevin Lubick Auto-Submit: Florin Malita --- experimental/skottiekit/CHANGELOG.md | 3 +++ experimental/skottiekit/compile.sh | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/experimental/skottiekit/CHANGELOG.md b/experimental/skottiekit/CHANGELOG.md index 1c32712695..976217699d 100644 --- a/experimental/skottiekit/CHANGELOG.md +++ b/experimental/skottiekit/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added + - Include a non-empty font manager, to support loading custom fonts. + ## [0.1.0] 2020-07-21 Beginning of changelog. diff --git a/experimental/skottiekit/compile.sh b/experimental/skottiekit/compile.sh index e439ce89f4..1a3cae4abb 100755 --- a/experimental/skottiekit/compile.sh +++ b/experimental/skottiekit/compile.sh @@ -34,7 +34,8 @@ if [[ $@ == *full-build* ]]; then # Full Skottie with all bells and whistles. BUILD_TYPE="full" BUILD_CFG="\ - skia_enable_fontmgr_custom_empty=true \ + skia_enable_fontmgr_custom_embedded=true \ + skia_enable_fontmgr_custom_empty=false \ skia_use_freetype=true \ skia_use_libgifcodec=true \ skia_use_harfbuzz=true \ @@ -53,7 +54,8 @@ else # Smallest usable Skottie. BUILD_TYPE="minimal" BUILD_CFG="\ - skia_enable_fontmgr_custom_empty=false \ + skia_enable_fontmgr_custom_embedded=false \ + skia_enable_fontmgr_custom_empty=true \ skia_use_freetype=false \ skia_use_libgifcodec=false \ skia_use_harfbuzz=false \ @@ -156,9 +158,7 @@ echo "Compiling bitcode" skia_use_piex=false \ skia_use_system_libjpeg_turbo=false \ skia_use_vulkan=false \ - skia_enable_fontmgr_empty=true \ skia_enable_fontmgr_custom_directory=false \ - skia_enable_fontmgr_custom_embedded=false \ skia_enable_sksl_interpreter=false \ \ ${GN_GPU} \