From fa80f00d7d58e0f3afbc24b85c538fd7bbb83400 Mon Sep 17 00:00:00 2001
From: xieyijun3 <xieyijun3@huawei.com>
Date: Sat, 26 Aug 2023 05:43:39 +0800
Subject: [PATCH] add build glfw Signed-off-by: x30034819
 <xieyijun3@huawei.com>

Signed-off-by: xieyijun3 <xieyijun3@huawei.com>
---
 ace_build/glfw/BUILD.gn                       | 3 +--
 glfw/BUILD.gn                                 | 9 +++------
 project_build/gn/BUILD.gn                     | 1 +
 project_build/gn/configs/system_libs/BUILD.gn | 4 ++++
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ace_build/glfw/BUILD.gn b/ace_build/glfw/BUILD.gn
index 61febcd9..8a836d22 100644
--- a/ace_build/glfw/BUILD.gn
+++ b/ace_build/glfw/BUILD.gn
@@ -119,6 +119,7 @@ template("flutter_platform_glfw") {
       # Fangtian TODO
       # "$ace_flutter_engine_root/icu:icu_config",
       ":flutter_glfw_config",
+      "//build/gn/configs/system_libs:glfw_config",
     ]
 
     sources = [
@@ -144,8 +145,6 @@ template("flutter_platform_glfw") {
       ":flutter_embedder_with_symbol_prefix_$platform",
       ":flutter_platform_common_client_wrapper",
     ]
-
-    deps += [ "$flutter_root/glfw:glfw" ]
   }
 }
 
diff --git a/glfw/BUILD.gn b/glfw/BUILD.gn
index dc355443..359d2a07 100644
--- a/glfw/BUILD.gn
+++ b/glfw/BUILD.gn
@@ -1,7 +1,7 @@
 # Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved.
 
-import("//build/gn/fangtian.gni")
-import("//third_party/flutter/glfw/glfw_ace_config.gni")
+import("//project_build/gn/fangtian.gni")
+import("glfw_ace_config.gni")
 
 config("glfw_inner_headers") {
   include_dirs = [ "include" ]
@@ -11,7 +11,7 @@ config("glfw_config_mac") {
   cflags = [ "-Wno-sign-compare" ]
 }
 
-ft_shared_library("glfw") {
+ft_shared_library("ft_glfw") {
   defines = [ "PREVIEW" ]
   include_dirs = [ "src" ]
   public = [
@@ -119,7 +119,4 @@ ft_shared_library("glfw") {
     ]
     defines += [ "_GLFW_X11" ]
   }
-
-  part_name = "graphic_standard"
-  subsystem_name = "graphic"
 }
diff --git a/project_build/gn/BUILD.gn b/project_build/gn/BUILD.gn
index 527a0364..318020aa 100644
--- a/project_build/gn/BUILD.gn
+++ b/project_build/gn/BUILD.gn
@@ -15,5 +15,6 @@ group("ft_flutter") {
   deps = [
     "//ft_build/libtxt:thirdparty_lib_txt_fangtian",
     "//ft_build/skia:ace_skia_fangtian",
+    "//glfw:ft_glfw",
   ]
 }
diff --git a/project_build/gn/configs/system_libs/BUILD.gn b/project_build/gn/configs/system_libs/BUILD.gn
index 506dbd2b..aa605ac1 100644
--- a/project_build/gn/configs/system_libs/BUILD.gn
+++ b/project_build/gn/configs/system_libs/BUILD.gn
@@ -41,6 +41,10 @@ config("skia_config") {
     libs = [ "ace_skia_fangtian" ]
 }
 
+config("glfw_config") {
+    libs = [ "libft_glfw" ]
+}
+
 config("samgr_config") {
     include_dirs = [ "${sys_inc}/samgr" ]
     libs = [ "samgr_proxy" ]
-- 
Gitee