From 35c0be84cddc8b08345565e118728501084c16a1 Mon Sep 17 00:00:00 2001 From: changleipeng Date: Fri, 8 Sep 2023 10:40:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=A5=E7=A6=BBlibtxt=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: changleipeng --- frameworks/base/base64/BUILD.gn | 4 ++++ frameworks/core/components/components.gni | 5 +++++ frameworks/core/components/theme/BUILD.gn | 4 ++++ frameworks/core/components_ng/components.gni | 5 +++++ .../core/components_ng/test/event/event_manager/BUILD.gn | 4 ++++ frameworks/core/image/apng/BUILD.gn | 4 ++++ frameworks/core/pipeline/BUILD.gn | 4 ++++ frameworks/core/pipeline_ng/BUILD.gn | 4 ++++ test/unittest/BUILD.gn | 8 ++++++++ test/unittest/ace_unittest.gni | 8 ++++++++ 10 files changed, 50 insertions(+) diff --git a/frameworks/base/base64/BUILD.gn b/frameworks/base/base64/BUILD.gn index 1c09248ad5a..a80a187d6ce 100644 --- a/frameworks/base/base64/BUILD.gn +++ b/frameworks/base/base64/BUILD.gn @@ -28,6 +28,10 @@ template("ace_base_base64") { "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform", "$skia_root_new:skia_$platform", ] + if (enable_graphic_text_gine) { + deps -= + [ "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform" ] + } configs += [ "$ace_flutter_engine_root:flutter_config" ] } else { deps += [ diff --git a/frameworks/core/components/components.gni b/frameworks/core/components/components.gni index b973e30d9d0..05e11887222 100644 --- a/frameworks/core/components/components.gni +++ b/frameworks/core/components/components.gni @@ -66,6 +66,11 @@ template("build_component") { "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform", "$skia_root_new:skia_$platform", ] + if (enable_graphic_text_gine) { + deps -= + [ "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform" ] + deps += [ "$ace_flutter_engine_root:flutter_engine_fml_$platform" ] + } configs += [ "$ace_flutter_engine_root:flutter_config" ] } else { deps += [ diff --git a/frameworks/core/components/theme/BUILD.gn b/frameworks/core/components/theme/BUILD.gn index 47d04ac003f..8a13b7a8ee9 100644 --- a/frameworks/core/components/theme/BUILD.gn +++ b/frameworks/core/components/theme/BUILD.gn @@ -45,6 +45,10 @@ template("ace_core_components_theme_set") { "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform", "$skia_root_new:skia_$platform", ] + if (enable_graphic_text_gine) { + deps -= + [ "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform" ] + } } else { deps += [ "$ace_flutter_engine_root:third_party_flutter_engine_$platform", diff --git a/frameworks/core/components_ng/components.gni b/frameworks/core/components_ng/components.gni index c889ba82dc0..9a4bc141ccd 100644 --- a/frameworks/core/components_ng/components.gni +++ b/frameworks/core/components_ng/components.gni @@ -111,6 +111,11 @@ template("build_component_ng") { "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform", "$skia_root_new:skia_$platform", ] + if (enable_graphic_text_gine) { + deps -= + [ "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform" ] + deps += [ "$ace_flutter_engine_root:flutter_engine_fml_$platform" ] + } } else { deps += [ "$ace_flutter_engine_root:third_party_flutter_engine_$platform", diff --git a/frameworks/core/components_ng/test/event/event_manager/BUILD.gn b/frameworks/core/components_ng/test/event/event_manager/BUILD.gn index 1192244526b..f21986e2687 100644 --- a/frameworks/core/components_ng/test/event/event_manager/BUILD.gn +++ b/frameworks/core/components_ng/test/event/event_manager/BUILD.gn @@ -122,6 +122,10 @@ ohos_unittest("event_manager_test_ng") { "//third_party/googletest:gmock_main", ] + if (enable_graphic_text_gine) { + deps -= [ "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_ohos" ] + } + configs = [ "$ace_root/test/unittest:ace_unittest_config", "$ace_flutter_engine_root:flutter_config", diff --git a/frameworks/core/image/apng/BUILD.gn b/frameworks/core/image/apng/BUILD.gn index 9239a6740dd..2d340033291 100644 --- a/frameworks/core/image/apng/BUILD.gn +++ b/frameworks/core/image/apng/BUILD.gn @@ -55,6 +55,10 @@ template("ace_core_apng_source_set") { "$ace_flutter_engine_root:third_party_flutter_engine_$platform", "$ace_flutter_engine_root/skia:ace_skia_$platform", ] + if (enable_graphic_text_gine) { + deps -= + [ "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform" ] + } } cflags_cc = [] diff --git a/frameworks/core/pipeline/BUILD.gn b/frameworks/core/pipeline/BUILD.gn index a0a852fe6d7..8563dcc9373 100644 --- a/frameworks/core/pipeline/BUILD.gn +++ b/frameworks/core/pipeline/BUILD.gn @@ -85,6 +85,10 @@ template("ace_core_pipeline_source_set") { "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform", "$skia_root_new:skia_$platform", ] + if (enable_graphic_text_gine) { + deps -= + [ "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform" ] + } configs += [ "$ace_flutter_engine_root:flutter_config" ] } else { deps += [ diff --git a/frameworks/core/pipeline_ng/BUILD.gn b/frameworks/core/pipeline_ng/BUILD.gn index 76a937d62b3..13a2a505b52 100644 --- a/frameworks/core/pipeline_ng/BUILD.gn +++ b/frameworks/core/pipeline_ng/BUILD.gn @@ -50,6 +50,10 @@ template("ace_core_pipeline_ng_source_set") { "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform", "$skia_root_new:skia_$platform", ] + if (enable_graphic_text_gine) { + deps -= + [ "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform" ] + } configs += [ "$ace_flutter_engine_root:flutter_config" ] } else { deps += [ diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index b67694b0f1f..920d8a07469 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -344,6 +344,14 @@ ohos_source_set("ace_engine_unittest_flutter_deps") { "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_ohos", "$skia_root_new:skia_ohos", ] + if (enable_graphic_text_gine) { + public_deps -= + [ "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_ohos" ] + public_deps += [ + "$ace_flutter_engine_root:flutter_engine_fml_ohos", + "$ace_flutter_engine_root/icu:ace_libicu_ohos", + ] + } cflags_cc = [ "-Wno-thread-safety-attributes" ] external_deps = [ "eventhandler:libeventhandler" ] public_configs += [ "$ace_flutter_engine_root:flutter_config" ] diff --git a/test/unittest/ace_unittest.gni b/test/unittest/ace_unittest.gni index a92774e224a..5434a7b72c3 100644 --- a/test/unittest/ace_unittest.gni +++ b/test/unittest/ace_unittest.gni @@ -90,6 +90,14 @@ template("ace_unittest") { "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_ohos", "$skia_root_new:skia_ohos", ] + if (enable_graphic_text_gine) { + ace_unittest_deps -= + [ "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_ohos" ] + ace_unittest_deps += [ + "$ace_flutter_engine_root:flutter_engine_fml_ohos", + "$ace_flutter_engine_root/icu:ace_libicu_ohos", + ] + } ace_unittest_config += [ "$ace_flutter_engine_root:flutter_config" ] flutter_external_deps = [ "eventhandler:libeventhandler" ] } else {