diff --git a/build/skia/BUILD.gn b/build/skia/BUILD.gn index 16cb75d44fdcd12234277a8700204be3f981fb00..6845e7d48fc180b776f44594036224aac6c18b78 100644 --- a/build/skia/BUILD.gn +++ b/build/skia/BUILD.gn @@ -1856,7 +1856,7 @@ ohos_source_set("ace_fontmgr_standard") { "$flutter_root/skia/src/ports/skia_ohos/SkFontStyleSet_ohos.cpp", "$flutter_root/skia/src/ports/skia_ohos/SkTypeface_ohos.cpp", ] - + defines = [] cflags_cc = ace_skia_common_ccflags cflags_cc += [ "-Wsign-compare", @@ -1877,16 +1877,14 @@ ohos_source_set("ace_fontmgr_standard") { } } - defines = [ "SK_BUILD_FONT_MGR_FOR_OHOS" ] if (use_mingw_win) { defines += [ "SK_BUILD_FONT_MGR_FOR_PREVIEW_WIN" ] - defines -= [ "SK_BUILD_FONT_MGR_FOR_OHOS" ] } else if (use_mac) { defines += [ "SK_BUILD_FONT_MGR_FOR_PREVIEW_MAC" ] - defines -= [ "SK_BUILD_FONT_MGR_FOR_OHOS" ] } else if (use_linux) { defines += [ "SK_BUILD_FONT_MGR_FOR_PREVIEW_LINUX" ] - defines -= [ "SK_BUILD_FONT_MGR_FOR_OHOS" ] + } else { + defines += [ "SK_BUILD_FONT_MGR_FOR_OHOS" ] } } diff --git a/engine/flutter/third_party/txt/src/txt/platform.cc b/engine/flutter/third_party/txt/src/txt/platform.cc index 26305ea237f9167727272c91cc73e5b3fab0ccde..42770abf047b5f82a6fd7fef13df1b1e2c01ef4d 100644 --- a/engine/flutter/third_party/txt/src/txt/platform.cc +++ b/engine/flutter/third_party/txt/src/txt/platform.cc @@ -6,7 +6,6 @@ #if defined(SK_BUILD_FONT_MGR_FOR_PREVIEW_WIN) #include "include/core/SkFontMgr.h" -std::string SkFontMgr::runtimeOS = "OHOS"; #endif namespace txt { diff --git a/engine/flutter/third_party/txt/src/txt/platform_linux.cc b/engine/flutter/third_party/txt/src/txt/platform_linux.cc index d36e247aa5d578cf214bb0d4e75815c018bff684..36b3a55aef632f9bc00a1685f8e53f6477f8b6f0 100644 --- a/engine/flutter/third_party/txt/src/txt/platform_linux.cc +++ b/engine/flutter/third_party/txt/src/txt/platform_linux.cc @@ -6,7 +6,7 @@ #if defined(SK_BUILD_FONT_MGR_FOR_PREVIEW_LINUX) #include "include/core/SkFontMgr.h" -std::string SkFontMgr::runtimeOS = "OHOS"; + #endif #ifdef FLUTTER_USE_FONTCONFIG diff --git a/engine/flutter/third_party/txt/src/txt/platform_mac.mm b/engine/flutter/third_party/txt/src/txt/platform_mac.mm index f11ef4cab3704dfefacb920b43adbeb781e4f562..e3b6c23d07a82d965b9eb558558bab2cec618783 100644 --- a/engine/flutter/third_party/txt/src/txt/platform_mac.mm +++ b/engine/flutter/third_party/txt/src/txt/platform_mac.mm @@ -16,7 +16,6 @@ #if defined(SK_BUILD_FONT_MGR_FOR_PREVIEW_MAC) #include "include/core/SkFontMgr.h" -std::string SkFontMgr::runtimeOS = "OHOS"; #endif namespace txt { diff --git a/skia/src/ports/SkFontHost_mac.cpp b/skia/src/ports/SkFontHost_mac.cpp index 3d2069d9509f140c42917ecc3ed4d7f211856703..f387f6a1663c8ceafe4efcab937834af986b3670 100644 --- a/skia/src/ports/SkFontHost_mac.cpp +++ b/skia/src/ports/SkFontHost_mac.cpp @@ -2916,7 +2916,7 @@ protected: #include "src/ports/SkFontMgr_preview.h" SK_API sk_sp SkFontMgr_New_OHOS(const char* path); - +std::string SkFontMgr::runtimeOS = "OHOS"; sk_sp SkFontMgr::Factory() { if (SkFontMgr::runtimeOS == "OHOS") { diff --git a/skia/src/ports/SkFontMgr_custom_directory_factory.cpp b/skia/src/ports/SkFontMgr_custom_directory_factory.cpp index 0b173c3adbf00f57abb92c58da6d11ed5528bdd3..6b06ca001dd80d6090477842a0dc2fe7f4c6c35f 100644 --- a/skia/src/ports/SkFontMgr_custom_directory_factory.cpp +++ b/skia/src/ports/SkFontMgr_custom_directory_factory.cpp @@ -12,13 +12,10 @@ #define SK_FONT_FILE_PREFIX "/usr/share/fonts/" #endif -#ifdef SK_BUILD_FONT_MGR_FOR_PREVIEW_LINUX -SK_API sk_sp SkFontMgr_New_OHOS(const char *path); -#endif - #if defined(SK_BUILD_FONT_MGR_FOR_PREVIEW_LINUX) #include "src/ports/SkFontMgr_preview.h" - +std::string SkFontMgr::runtimeOS = "OHOS"; +SK_API sk_sp SkFontMgr_New_OHOS(const char *path); sk_sp SkFontMgr::Factory() { if (SkFontMgr::runtimeOS == "OHOS") { diff --git a/skia/src/ports/SkFontMgr_win_factory.cpp b/skia/src/ports/SkFontMgr_win_factory.cpp index b90967f60e46e938ba7f24ea4c37a0247a955edf..3a74ab1f9270ca127d7db8a7b3a392493bd0975c 100644 --- a/skia/src/ports/SkFontMgr_win_factory.cpp +++ b/skia/src/ports/SkFontMgr_win_factory.cpp @@ -13,6 +13,7 @@ #include "include/ports/SkTypeface_win.h" #include "src/ports/SkFontMgr_preview.h" +std::string SkFontMgr::runtimeOS = "OHOS"; SK_API sk_sp SkFontMgr_New_OHOS(const char *path); sk_sp SkFontMgr::Factory()