From 78791701e444f23ec3bc28df2ceab3637422fa9d Mon Sep 17 00:00:00 2001
From: lihao <lihao71@huawei.com>
Date: Fri, 13 Jan 2023 17:26:29 +0800
Subject: [PATCH] adapter rosen cross-compile dependence

Signed-off-by: lihao <lihao71@huawei.com>
Change-Id: I31953ee3c5376561068af5f1919cb13cdad2b65b
---
 build/skia/BUILD.gn                                      | 8 +++-----
 engine/flutter/third_party/txt/src/txt/platform.cc       | 1 -
 engine/flutter/third_party/txt/src/txt/platform_linux.cc | 2 +-
 engine/flutter/third_party/txt/src/txt/platform_mac.mm   | 1 -
 skia/src/ports/SkFontHost_mac.cpp                        | 2 +-
 skia/src/ports/SkFontMgr_custom_directory_factory.cpp    | 7 ++-----
 skia/src/ports/SkFontMgr_win_factory.cpp                 | 1 +
 7 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/build/skia/BUILD.gn b/build/skia/BUILD.gn
index 16cb75d4..6845e7d4 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 26305ea2..42770abf 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 d36e247a..36b3a55a 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 f11ef4ca..e3b6c23d 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 3d2069d9..f387f6a1 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> SkFontMgr_New_OHOS(const char* path);
-
+std::string SkFontMgr::runtimeOS = "OHOS";
 sk_sp<SkFontMgr> 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 0b173c3a..6b06ca00 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> 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> SkFontMgr_New_OHOS(const char *path);
 sk_sp<SkFontMgr> 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 b90967f6..3a74ab1f 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> SkFontMgr_New_OHOS(const char *path);
 
 sk_sp<SkFontMgr> SkFontMgr::Factory()
-- 
Gitee