| Index: ui/views/mus/aura_init.cc
|
| diff --git a/ui/views/mus/aura_init.cc b/ui/views/mus/aura_init.cc
|
| index 5335188700b22c2e8aa2cab998472ff8e0f439c1..26eb071349fcc23b55971698c4647d9e7620fda0 100644
|
| --- a/ui/views/mus/aura_init.cc
|
| +++ b/ui/views/mus/aura_init.cc
|
| @@ -19,7 +19,7 @@
|
| #include "ui/base/ui_base_paths.h"
|
| #include "ui/views/views_delegate.h"
|
|
|
| -#if defined(OS_LINUX) && !defined(OS_ANDROID)
|
| +#if defined(OS_LINUX)
|
| #include "components/font_service/public/cpp/font_loader.h"
|
| #endif
|
|
|
| @@ -63,7 +63,7 @@ AuraInit::AuraInit(shell::Connector* connector,
|
| }
|
|
|
| AuraInit::~AuraInit() {
|
| -#if defined(OS_LINUX) && !defined(OS_ANDROID)
|
| +#if defined(OS_LINUX)
|
| if (font_loader_.get()) {
|
| SkFontConfigInterface::SetGlobal(nullptr);
|
| // FontLoader is ref counted. We need to explicitly shutdown the background
|
| @@ -91,7 +91,7 @@ void AuraInit::InitializeResources(shell::Connector* connector) {
|
| std::move(pak_file_2), ui::SCALE_FACTOR_100P);
|
|
|
| // Initialize the skia font code to go ask fontconfig underneath.
|
| -#if defined(OS_LINUX) && !defined(OS_ANDROID)
|
| +#if defined(OS_LINUX)
|
| font_loader_ = sk_make_sp<font_service::FontLoader>(connector);
|
| SkFontConfigInterface::SetGlobal(font_loader_.get());
|
| #endif
|
|
|