From 28c844a7ef8936d2b9a14488a005ad314e982ce1 Mon Sep 17 00:00:00 2001 From: xieyijun3 Date: Mon, 9 Oct 2023 14:21:28 +0800 Subject: [PATCH 1/2] rm deps ace_skia_fangtian Signed-off-by: x30034819 Signed-off-by: xieyijun3 --- ace_engine/adapter/fangtian/entrance/BUILD.gn | 3 ++- ace_engine/frameworks/base/base64/ft_build/BUILD.gn | 2 +- ace_engine/frameworks/core/components/ft_build/components.gni | 3 ++- ace_engine/frameworks/core/components/theme/ft_build/BUILD.gn | 3 +-- .../frameworks/core/components_ng/ft_build/components.gni | 3 ++- ace_engine/frameworks/core/ft_build/BUILD.gn | 4 ++-- ace_engine/frameworks/core/pipeline/ft_build/BUILD.gn | 2 +- ace_engine/frameworks/core/pipeline_ng/ft_build/BUILD.gn | 2 +- 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ace_engine/adapter/fangtian/entrance/BUILD.gn b/ace_engine/adapter/fangtian/entrance/BUILD.gn index 75587a06b..a49a78899 100644 --- a/ace_engine/adapter/fangtian/entrance/BUILD.gn +++ b/ace_engine/adapter/fangtian/entrance/BUILD.gn @@ -44,13 +44,14 @@ ft_source_set("ace_entrance_fangtian") { deps = [ "$ace_root/frameworks/core/components/theme/ft_build:build_theme_code", "//build/gn/configs/system_libs:ft_engine", + "//build/gn/configs/system_libs:harfbuzz", + "//build/gn/configs/system_libs:skia", "$ace_flutter_engine_root:third_party_flutter_engine_fangtian", ] defines += [ "ENABLE_ROSEN_BACKEND", "FT_BUILD", "SK_BUILD_FONT_MGR_FOR_PREVIEW_LINUX" ] public_deps = [ "$ace_flutter_engine_root/glfw:flutter_glfw_fangtian", - "$ace_flutter_engine_root/skia:ace_skia_fangtian", "//resource_management/frameworks/resmgr/ft_build:global_resmgr_linux", ] } diff --git a/ace_engine/frameworks/base/base64/ft_build/BUILD.gn b/ace_engine/frameworks/base/base64/ft_build/BUILD.gn index 61c4fd399..30b46ad58 100644 --- a/ace_engine/frameworks/base/base64/ft_build/BUILD.gn +++ b/ace_engine/frameworks/base/base64/ft_build/BUILD.gn @@ -25,7 +25,7 @@ template("ace_base_base64") { deps += [ "$ace_flutter_engine_root:third_party_flutter_engine_$platform", - "$ace_flutter_engine_root/skia:ace_skia_$platform", + "//build/gn/configs/system_libs:skia", ] # add base source file here diff --git a/ace_engine/frameworks/core/components/ft_build/components.gni b/ace_engine/frameworks/core/components/ft_build/components.gni index 429fdc0ce..0947b277f 100644 --- a/ace_engine/frameworks/core/components/ft_build/components.gni +++ b/ace_engine/frameworks/core/components/ft_build/components.gni @@ -95,7 +95,8 @@ template("build_component") { } else { public_deps += [ "$ace_flutter_engine_root:third_party_flutter_engine_$platform", - "$ace_flutter_engine_root/skia:ace_skia_$platform", + "//build/gn/configs/system_libs:harfbuzz", + "//build/gn/configs/system_libs:skia", "//build/gn/configs/system_libs:c_utils", ] } diff --git a/ace_engine/frameworks/core/components/theme/ft_build/BUILD.gn b/ace_engine/frameworks/core/components/theme/ft_build/BUILD.gn index 2a34380a5..32c80179d 100644 --- a/ace_engine/frameworks/core/components/theme/ft_build/BUILD.gn +++ b/ace_engine/frameworks/core/components/theme/ft_build/BUILD.gn @@ -37,7 +37,7 @@ template("ace_core_components_theme_set") { configs = [ "$ace_root/ft_build:ace_config" ] deps = [ ":build_theme_code", - "$ace_flutter_engine_root/skia:ace_skia_$platform", + "//build/gn/configs/system_libs:skia", ] sources = [ @@ -56,7 +56,6 @@ template("ace_core_components_theme_set") { foreach(item, ace_platforms) { ace_core_components_theme_set("ace_core_components_theme_" + item.name) { - platform = item.name defines = [] config = { } diff --git a/ace_engine/frameworks/core/components_ng/ft_build/components.gni b/ace_engine/frameworks/core/components_ng/ft_build/components.gni index 2c9dd7c4f..e91ea3479 100644 --- a/ace_engine/frameworks/core/components_ng/ft_build/components.gni +++ b/ace_engine/frameworks/core/components_ng/ft_build/components.gni @@ -77,7 +77,8 @@ template("build_component_ng") { } else { public_deps = [ "$ace_flutter_engine_root:third_party_flutter_engine_$platform", - "$ace_flutter_engine_root/skia:ace_skia_$platform", + "//build/gn/configs/system_libs:harfbuzz", + "//build/gn/configs/system_libs:skia", ] } diff --git a/ace_engine/frameworks/core/ft_build/BUILD.gn b/ace_engine/frameworks/core/ft_build/BUILD.gn index 2c80d6598..a87688176 100644 --- a/ace_engine/frameworks/core/ft_build/BUILD.gn +++ b/ace_engine/frameworks/core/ft_build/BUILD.gn @@ -237,7 +237,7 @@ template("ace_core_source_set") { public_deps = [ "//build/gn/configs/system_libs:ft_engine", "$ace_flutter_engine_root/glfw:flutter_glfw_$platform", - "$ace_flutter_engine_root/skia:ace_skia_$platform", + "//build/gn/configs/system_libs:skia", ] } @@ -713,7 +713,7 @@ template("ace_core_ng_source_set") { if (enable_ng_build) { deps += [ "$ace_flutter_engine_root_new:third_party_flutter_engine_dev_$platform", - "$ace_flutter_engine_root_new/third_party/skia:ace_skia_dev_$platform", + "//build/gn/configs/system_libs:skia", ] } diff --git a/ace_engine/frameworks/core/pipeline/ft_build/BUILD.gn b/ace_engine/frameworks/core/pipeline/ft_build/BUILD.gn index 431c25ac9..23ad4f4e1 100644 --- a/ace_engine/frameworks/core/pipeline/ft_build/BUILD.gn +++ b/ace_engine/frameworks/core/pipeline/ft_build/BUILD.gn @@ -70,7 +70,7 @@ template("ace_core_pipeline_source_set") { public_deps = [ "$ace_flutter_engine_root:third_party_flutter_engine_$platform", - "$ace_flutter_engine_root/skia:ace_skia_$platform", + "//build/gn/configs/system_libs:skia", ] if (defined(config.enable_rosen_backend) && config.enable_rosen_backend) { diff --git a/ace_engine/frameworks/core/pipeline_ng/ft_build/BUILD.gn b/ace_engine/frameworks/core/pipeline_ng/ft_build/BUILD.gn index adb54a5be..2acdf143b 100644 --- a/ace_engine/frameworks/core/pipeline_ng/ft_build/BUILD.gn +++ b/ace_engine/frameworks/core/pipeline_ng/ft_build/BUILD.gn @@ -39,7 +39,7 @@ template("ace_core_pipeline_ng_source_set") { } else { deps += [ "$ace_flutter_engine_root:third_party_flutter_engine_$platform", - "$ace_flutter_engine_root/skia:ace_skia_$platform", + "//build/gn/configs/system_libs:skia", ] } -- Gitee From e5aff183c7810cbe36834b9d622ebae2e475a081 Mon Sep 17 00:00:00 2001 From: xieyijun3 Date: Tue, 10 Oct 2023 11:20:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?flutter=E4=BF=AE=E6=94=B9=E4=B8=BAso?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=20Signed-off-by:=20x30034819=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xieyijun3 --- ace_engine/adapter/fangtian/entrance/BUILD.gn | 2 +- .../fangtian/entrance/samples/BUILD.gn | 2 ++ ace_engine/adapter/fangtian/ft_build/BUILD.gn | 1 - .../frameworks/base/base64/ft_build/BUILD.gn | 2 -- .../frameworks/base/i18n/ft_build/BUILD.gn | 2 +- .../declarative_frontend/ft_build/BUILD.gn | 2 +- .../core/components/ft_build/components.gni | 2 +- .../components_ng/ft_build/components.gni | 2 +- ace_engine/frameworks/core/ft_build/BUILD.gn | 4 ++-- .../core/pipeline/ft_build/BUILD.gn | 4 +--- .../core/pipeline_ng/ft_build/BUILD.gn | 4 ++-- build/gn/BUILD.gn | 7 ------- build/gn/configs/system_libs/BUILD.gn | 19 +++++++++++++++++-- 13 files changed, 29 insertions(+), 24 deletions(-) diff --git a/ace_engine/adapter/fangtian/entrance/BUILD.gn b/ace_engine/adapter/fangtian/entrance/BUILD.gn index a49a78899..b598e74e9 100644 --- a/ace_engine/adapter/fangtian/entrance/BUILD.gn +++ b/ace_engine/adapter/fangtian/entrance/BUILD.gn @@ -46,12 +46,12 @@ ft_source_set("ace_entrance_fangtian") { "//build/gn/configs/system_libs:ft_engine", "//build/gn/configs/system_libs:harfbuzz", "//build/gn/configs/system_libs:skia", + "//build/gn/configs/system_libs:flutter", "$ace_flutter_engine_root:third_party_flutter_engine_fangtian", ] defines += [ "ENABLE_ROSEN_BACKEND", "FT_BUILD", "SK_BUILD_FONT_MGR_FOR_PREVIEW_LINUX" ] public_deps = [ - "$ace_flutter_engine_root/glfw:flutter_glfw_fangtian", "//resource_management/frameworks/resmgr/ft_build:global_resmgr_linux", ] } diff --git a/ace_engine/adapter/fangtian/entrance/samples/BUILD.gn b/ace_engine/adapter/fangtian/entrance/samples/BUILD.gn index d88e2d526..788fb083c 100644 --- a/ace_engine/adapter/fangtian/entrance/samples/BUILD.gn +++ b/ace_engine/adapter/fangtian/entrance/samples/BUILD.gn @@ -55,6 +55,8 @@ ft_executable("hap_executor") { "//napi/ft_build:ace_container_scope", "//arkcompiler/ets_runtime/ft_build:libark_jsruntime", "//build/gn/configs/system_libs:glfw", + "//build/gn/configs/system_libs:skia", + "//build/gn/configs/system_libs:flutter", "//build/gn/configs/system_libs:ft_engine", "//build/gn/configs/system_libs:c_utils", "//build/gn/configs/system_libs:harfbuzz", diff --git a/ace_engine/adapter/fangtian/ft_build/BUILD.gn b/ace_engine/adapter/fangtian/ft_build/BUILD.gn index 959a8abb5..02e46e362 100644 --- a/ace_engine/adapter/fangtian/ft_build/BUILD.gn +++ b/ace_engine/adapter/fangtian/ft_build/BUILD.gn @@ -19,7 +19,6 @@ ft_shared_library("libace_engine") { deps = [ "$ace_root/ft_build/build:libace_static_${platform}", - "$ace_flutter_engine_root/glfw:flutter_glfw_$platform", ] } diff --git a/ace_engine/frameworks/base/base64/ft_build/BUILD.gn b/ace_engine/frameworks/base/base64/ft_build/BUILD.gn index 30b46ad58..13d891fc2 100644 --- a/ace_engine/frameworks/base/base64/ft_build/BUILD.gn +++ b/ace_engine/frameworks/base/base64/ft_build/BUILD.gn @@ -24,7 +24,6 @@ template("ace_base_base64") { sources = [] deps += [ - "$ace_flutter_engine_root:third_party_flutter_engine_$platform", "//build/gn/configs/system_libs:skia", ] @@ -37,7 +36,6 @@ template("ace_base_base64") { foreach(item, ace_platforms) { ace_base_base64("ace_base_base64_" + item.name) { - platform = item.name defines = [] cflags_cc = [] config = { diff --git a/ace_engine/frameworks/base/i18n/ft_build/BUILD.gn b/ace_engine/frameworks/base/i18n/ft_build/BUILD.gn index 42c146761..190fb7c8a 100644 --- a/ace_engine/frameworks/base/i18n/ft_build/BUILD.gn +++ b/ace_engine/frameworks/base/i18n/ft_build/BUILD.gn @@ -34,7 +34,7 @@ template("ace_base_i18n") { assert(false, "use_external_icu is not supported in non-fangtian build") } } else { - deps += [ "$ace_flutter_engine_root/icu:ace_libicu_$platform" ] + #deps += [ "$ace_flutter_engine_root/icu:ace_libicu_$platform" ] } configs += [ diff --git a/ace_engine/frameworks/bridge/declarative_frontend/ft_build/BUILD.gn b/ace_engine/frameworks/bridge/declarative_frontend/ft_build/BUILD.gn index e34669f0d..c0c231e8d 100644 --- a/ace_engine/frameworks/bridge/declarative_frontend/ft_build/BUILD.gn +++ b/ace_engine/frameworks/bridge/declarative_frontend/ft_build/BUILD.gn @@ -374,7 +374,7 @@ template("declarative_js_engine") { if (defined(config.plugin_components_support) && config.plugin_components_support) { - deps += [ "$ace_flutter_engine_root:third_party_flutter_engine_$platform" ] + #deps += [ "$ace_flutter_engine_root:third_party_flutter_engine_$platform" ] sources += [ "../jsview/js_plugin.cpp" ] } diff --git a/ace_engine/frameworks/core/components/ft_build/components.gni b/ace_engine/frameworks/core/components/ft_build/components.gni index 0947b277f..468025c29 100644 --- a/ace_engine/frameworks/core/components/ft_build/components.gni +++ b/ace_engine/frameworks/core/components/ft_build/components.gni @@ -94,7 +94,7 @@ template("build_component") { assert(false, "ng build is not supported yet") } else { public_deps += [ - "$ace_flutter_engine_root:third_party_flutter_engine_$platform", + "//build/gn/configs/system_libs:flutter", "//build/gn/configs/system_libs:harfbuzz", "//build/gn/configs/system_libs:skia", "//build/gn/configs/system_libs:c_utils", diff --git a/ace_engine/frameworks/core/components_ng/ft_build/components.gni b/ace_engine/frameworks/core/components_ng/ft_build/components.gni index e91ea3479..b9f695e31 100644 --- a/ace_engine/frameworks/core/components_ng/ft_build/components.gni +++ b/ace_engine/frameworks/core/components_ng/ft_build/components.gni @@ -76,7 +76,7 @@ template("build_component_ng") { assert(false, "enable_ng_build is not supported") } else { public_deps = [ - "$ace_flutter_engine_root:third_party_flutter_engine_$platform", + "//build/gn/configs/system_libs:flutter", "//build/gn/configs/system_libs:harfbuzz", "//build/gn/configs/system_libs:skia", ] diff --git a/ace_engine/frameworks/core/ft_build/BUILD.gn b/ace_engine/frameworks/core/ft_build/BUILD.gn index a87688176..d8f7c976d 100644 --- a/ace_engine/frameworks/core/ft_build/BUILD.gn +++ b/ace_engine/frameworks/core/ft_build/BUILD.gn @@ -236,7 +236,7 @@ template("ace_core_source_set") { if (is_fangtian_build) { public_deps = [ "//build/gn/configs/system_libs:ft_engine", - "$ace_flutter_engine_root/glfw:flutter_glfw_$platform", + #"$ace_flutter_engine_root/glfw:flutter_glfw_$platform", "//build/gn/configs/system_libs:skia", ] } @@ -712,7 +712,7 @@ template("ace_core_ng_source_set") { if (enable_ng_build) { deps += [ - "$ace_flutter_engine_root_new:third_party_flutter_engine_dev_$platform", + #"$ace_flutter_engine_root_new:third_party_flutter_engine_dev_$platform", "//build/gn/configs/system_libs:skia", ] } diff --git a/ace_engine/frameworks/core/pipeline/ft_build/BUILD.gn b/ace_engine/frameworks/core/pipeline/ft_build/BUILD.gn index 23ad4f4e1..a00d42e49 100644 --- a/ace_engine/frameworks/core/pipeline/ft_build/BUILD.gn +++ b/ace_engine/frameworks/core/pipeline/ft_build/BUILD.gn @@ -69,7 +69,7 @@ template("ace_core_pipeline_source_set") { ] public_deps = [ - "$ace_flutter_engine_root:third_party_flutter_engine_$platform", + "//build/gn/configs/system_libs:flutter", "//build/gn/configs/system_libs:skia", ] @@ -86,8 +86,6 @@ template("ace_core_pipeline_source_set") { foreach(item, ace_platforms) { ace_core_pipeline_source_set("ace_core_pipeline_" + item.name) { - platform = item.name - if (defined(item.config)) { config = item.config } else { diff --git a/ace_engine/frameworks/core/pipeline_ng/ft_build/BUILD.gn b/ace_engine/frameworks/core/pipeline_ng/ft_build/BUILD.gn index 2acdf143b..d1e67c033 100644 --- a/ace_engine/frameworks/core/pipeline_ng/ft_build/BUILD.gn +++ b/ace_engine/frameworks/core/pipeline_ng/ft_build/BUILD.gn @@ -38,7 +38,7 @@ template("ace_core_pipeline_ng_source_set") { assert(false, "not support ng build") } else { deps += [ - "$ace_flutter_engine_root:third_party_flutter_engine_$platform", + #"$ace_flutter_engine_root:third_party_flutter_engine_$platform", "//build/gn/configs/system_libs:skia", ] } @@ -57,7 +57,7 @@ template("ace_core_pipeline_ng_source_set") { foreach(item, ace_platforms) { ace_core_pipeline_ng_source_set("ace_core_pipeline_ng_" + item.name) { - platform = item.name + #platform = item.name if (defined(item.config)) { config = item.config diff --git a/build/gn/BUILD.gn b/build/gn/BUILD.gn index 133278e3f..9dbbc4457 100644 --- a/build/gn/BUILD.gn +++ b/build/gn/BUILD.gn @@ -27,11 +27,4 @@ group("arkui") { "//arkcompiler/ets_frontend/ft_build:ets_frontend_build", "//napi/ft_build:ace_napi", ] -} - -group("flutter") { - deps = [ - "//third_party/flutter/ace_build:third_party_flutter_engine_fangtian", - "//third_party/flutter/ace_build/glfw:flutter_glfw_fangtian", - ] } \ No newline at end of file diff --git a/build/gn/configs/system_libs/BUILD.gn b/build/gn/configs/system_libs/BUILD.gn index 5e5af8b04..9674eda1f 100644 --- a/build/gn/configs/system_libs/BUILD.gn +++ b/build/gn/configs/system_libs/BUILD.gn @@ -52,11 +52,22 @@ config("skia_config") { include_dirs = [ "${sys_inc}/skia", "${sys_inc}/skia/include", - "${sys_inc}/skia/include/core" + "${sys_inc}/skia/include/core", ] libs = [ "ace_skia_fangtian" ] } +config("flutter_config") { + visibility = [ ":*" ] + + include_dirs = [ + "${sys_inc}/flutter", + "${sys_inc}/flutter/shell/platform/common/cpp/public", + "${sys_inc}/flutter/third_party/txt/src", + ] + libs = [ "third_party_flutter_engine_fangtian" ] +} + config("samgr_config") { visibility = [ ":*" ] @@ -129,7 +140,7 @@ config("harfbuzz_config") { config("glfw_config") { visibility = [ ":*" ] - include_dirs = [ "//third_party/flutter/glfw/include" ] + include_dirs = [ "${sys_inc}/glfw", ] libs = ["ft_glfw"] } @@ -245,6 +256,10 @@ group("skia") { public_configs = [ ":skia_config" ] } +group("flutter") { + public_configs = [ ":flutter_config" ] +} + group("safwk") { public_deps = [ ":c_utils", -- Gitee