mirror of
https://gitee.com/openharmony/arkui_ace_engine
synced 2024-10-07 08:24:11 +00:00
剥离libtxt依赖
Signed-off-by: changleipeng <changleipeng4@huawei.com>
This commit is contained in:
parent
6e09128b30
commit
35c0be84cd
@ -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 += [
|
||||
|
@ -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 += [
|
||||
|
@ -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",
|
||||
|
@ -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",
|
||||
|
@ -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",
|
||||
|
@ -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 = []
|
||||
|
@ -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 += [
|
||||
|
@ -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 += [
|
||||
|
@ -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" ]
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user