openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-23 15:10:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!24440 remove flutter(arkui)

Browse Source 
Merge pull request !24440 from Far/master
This commit is contained in:
openharmony_ci 2023-12-30 10:37:07 +00:00 committed by Gitee
commit ff7d7cd411
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
31 changed files with 168 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
adapter/ohos/entrance/BUILD.gn
View File

@ -71,8 +71,7 @@ template("ace_ohos_standard_source_set") {
configs = [
"$ace_root:ace_config",
"$ace_flutter_engine_root:flutter_config",
"$ace_flutter_engine_root/icu:icu_config_$platform",
"//third_party/icu/icu4c:icu_config",
]
if (defined(config.enable_rosen_backend) && config.enable_rosen_backend) {
@ -94,10 +93,7 @@ template("ace_ohos_standard_source_set") {
"//third_party/node/src",
]
deps = [
"$ace_flutter_engine_root:flutter_engine_common_$platform",
"$skia_root_new:skia_$platform",
]
deps = [ "$skia_root_new:skia_$platform" ]
deps += [
"$ace_root/adapter/ohos/capability:ace_capability_ohos",

2
adapter/ohos/entrance/ace_ability.cpp
View File

@ -21,7 +21,7 @@
#include "ability_process.h"
#include "dm/display_manager.h"
#include "form_utils_impl.h"
#include "init_data.h"
#include "ohos/init_data.h"
#include "ipc_skeleton.h"
#include "res_config.h"
#include "resource_manager.h"

2
adapter/ohos/entrance/ace_application_info.cpp
View File

@ -20,7 +20,7 @@
#include <sys/stat.h>
#include "contrib/minizip/unzip.h"
#include "init_data.h"
#include "ohos/init_data.h"
#include "unicode/locid.h"
#include "base/i18n/localization.h"

2
adapter/ohos/entrance/ui_content_impl.cpp
View File

@ -21,7 +21,7 @@
#include "ability_context.h"
#include "ability_info.h"
#include "configuration.h"
#include "init_data.h"
#include "ohos/init_data.h"
#include "ipc_skeleton.h"
#include "js_runtime_utils.h"
#include "locale_config.h"

5
adapter/ohos/osal/BUILD.gn
View File

@ -91,10 +91,7 @@ template("ace_osal_ohos_source_set") {
"resource_convertor.cpp",
"resource_theme_style.cpp",
]
deps = [
"$ace_flutter_engine_root/icu:ace_libicu_ohos",
"$skia_root_new:skia_ohos",
]
deps = [ "$skia_root_new:skia_ohos" ]
if (defined(global_parts_info) &&
defined(global_parts_info.resourceschedule_soc_perf)) {

2
adapter/preview/entrance/BUILD.gn
View File

@ -59,10 +59,10 @@ ohos_source_set("preview_entrance_source") {
]
deps = [
"$ace_flutter_engine_root/skia:ace_skia_$platform",
"$ace_napi:ace_napi",
"$ace_root/frameworks/core/components/theme:build_theme_code",
"$ace_root/interfaces/inner_api/ace:ace_uicontent",
"$skia_root_new:skia_$platform",
]
external_deps = []
include_dirs = [

14
adapter/preview/sdk/sharedlib_config.gni
View File

@ -114,9 +114,9 @@ common_bin = [
part_name = "jsoncpp"
},
{
label = "//third_party/flutter/build/skia:skia_shared"
label = "//third_party/skia:skia_canvaskit"
subsystem_name = "thirdparty"
part_name = "flutter"
part_name = "skia"
},
{
label = "//arkcompiler/ets_runtime:libark_jsruntime"
@ -193,16 +193,6 @@ if (enable_graphic_text_gine) {
]
}
if (defined(use_new_skia) && use_new_skia) {
common_bin += [
{
label = "//third_party/skia:skia_canvaskit"
subsystem_name = "thirdparty"
part_name = "skia"
},
]
}
if (defined(use_rosen_drawing) && use_rosen_drawing) {
common_bin += [
{

4
build/ace_gen_obj.gni
View File

@ -30,10 +30,10 @@ template("gen_obj") {
script = "$ace_root/build/tools/build_resource_to_bytecode.py"
} else if (target_cpu == "x86_64") {
objcopy_tool = objcopy_x86_64
script = "$flutter_root/engine/flutter/sky/tools/objcopy.py"
script = "$ace_root/build/tools/run_objcopy.py"
} else {
objcopy_tool = objcopy_default
script = "$flutter_root/engine/flutter/sky/tools/objcopy.py"
script = "$ace_root/build/tools/run_objcopy.py"
}
args = [

66
build/tools/run_objcopy.py Executable file
View File

@ -0,0 +1,66 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# Copyright (c) 2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
import argparse
import os
import subprocess
import sys
OUTPUT_TARGET = {
'x86': 'elf32-i386',
'x86_64': 'elf64-x86-64',
'arm': 'elf32-littlearm',
'arm64': 'elf64-littleaarch64',
}
BUILD_ID_LINK_OUTPUT = {
'x86': 'i386',
'x86_64': 'i386:x86-64',
'arm': 'arm',
'arm64': 'aarch64',
}
def main():
parser = argparse.ArgumentParser(description='Translate and copy data file to object file')
parser.add_argument('-e', '--objcopy', type=str, required=True, help='The path of objcopy')
parser.add_argument('-a', '--arch', type=str, required=True, help='The architecture of target')
parser.add_argument('-i', '--input', type=str, required=True, help='The path of input file')
parser.add_argument('-o', '--output', type=str, required=True, help='The path of output target')
args = parser.parse_args()
input_dir, input_file = os.path.split(args.input)
cmd = [ args.objcopy, '-I', 'binary', '-B', BUILD_ID_LINK_OUTPUT[args.arch], '-O', OUTPUT_TARGET[args.arch],
input_file, args.output]
process = subprocess.Popen(cmd,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
universal_newlines=True,
cwd=input_dir)
for line in iter(process.stdout.readline, ''):
sys.stdout.write(line)
sys.stdout.flush()
process.wait()
ret_code = process.returncode
return ret_code
if __name__ == '__main__':
sys.exit(main())

68
build/tools/run_objcopy_pc_mac.py Executable file
View File

@ -0,0 +1,68 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# Copyright (c) 2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
import argparse
import os
import subprocess
import sys
OUTPUT_TARGET = {
'x86': 'elf32-i386',
'x64': 'elf64-x86-64',
'x86_64': 'pe-x86-64',
'arm': 'elf32-littlearm',
'arm64': 'elf64-littleaarch64',
}
BUILD_ID_LINK_OUTPUT = {
'x86': 'i386',
'x64': 'i386:x86-64',
'x86_64': 'i386:x86-64',
'arm': 'arm',
'arm64': 'aarch64',
}
def main():
parser = argparse.ArgumentParser(description='Translate and copy data file to object file')
parser.add_argument('-e', '--objcopy', type=str, required=True, help='The path of objcopy')
parser.add_argument('-a', '--arch', type=str, required=True, help='The architecture of target')
parser.add_argument('-i', '--input', type=str, required=True, help='The path of input file')
parser.add_argument('-o', '--output', type=str, required=True, help='The path of output target')
args = parser.parse_args()
input_dir, input_file = os.path.split(args.input)
cmd = [ args.objcopy, '-I', 'binary', '-B', BUILD_ID_LINK_OUTPUT[args.arch], '-O', OUTPUT_TARGET[args.arch],
input_file, args.output]
process = subprocess.Popen(cmd,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
universal_newlines=True,
cwd=input_dir)
for line in iter(process.stdout.readline, ''):
sys.stdout.write(line)
sys.stdout.flush()
process.wait()
ret_code = process.returncode
return ret_code
if __name__ == '__main__':
sys.exit(main())

10
frameworks/base/base64/BUILD.gn
View File

@ -19,18 +19,10 @@ template("ace_base_base64") {
source_set(target_name) {
defines += invoker.defines
cflags_cc += invoker.cflags_cc
deps = [
"$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform",
"$skia_root_new:skia_$platform",
]
deps = [ "$skia_root_new:skia_$platform" ]
include_dirs = []
sources = []
configs += [ "$ace_flutter_engine_root:flutter_config" ]
if (enable_graphic_text_gine) {
deps -= [ "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform" ]
}
# add base source file here
sources += [ "base64_util.cpp" ]

31
frameworks/base/i18n/BUILD.gn
View File

@ -25,27 +25,19 @@ template("ace_base_i18n") {
cflags_cc += invoker.cflags_cc
deps = [ "$ace_root/frameworks/base/resource:ace_resource" ]
if (defined(config.use_external_icu)) {
if (config.use_external_icu == "shared") {
deps += [ "//third_party/icu/icu4c:shared_icui18n" ]
} else if (config.use_external_icu == "static") {
deps += [ "//third_party/icu/icu4c:static_icui18n" ]
}
configs += [ "$ace_flutter_engine_root/icu:icu_config_$platform" ]
if (defined(config.use_external_icu) &&
config.use_external_icu == "static") {
deps += [
"//third_party/icu/icu4c:static_icui18n",
"//third_party/icu/icu4c:static_icuuc",
]
} else {
if (ace_use_rosen_drawing) {
if (platform == "ohos") {
deps += [ "$ace_flutter_engine_root/icu:ace_libicu_$platform" ]
} else {
include_dirs = [
"$skia_root_new/third_party/externals/icu/source/common",
"$skia_root_new/third_party/externals/icu/source/i18n/",
]
}
} else {
deps += [ "$ace_flutter_engine_root/icu:ace_libicu_$platform" ]
}
deps += [
"//third_party/icu/icu4c:shared_icui18n",
"//third_party/icu/icu4c:shared_icuuc",
]
}
configs += [ "//third_party/icu/icu4c:icu_config" ]
configs += [
":ace_base_i18n_config",
@ -59,7 +51,6 @@ template("ace_base_i18n") {
foreach(item, ace_platforms) {
ace_base_i18n("ace_base_i18n_" + item.name) {
platform = item.name
defines = []
cflags_cc = []
config = {

2
frameworks/base/resource/BUILD.gn
View File

@ -75,7 +75,7 @@ action_foreach("objcopy_resource") {
outputs = [ "$ace_resource_dir/{{source_name_part}}.o" ]
objcopy_tool = objcopy_default
script = "$flutter_root/engine/flutter/sky/tools/objcopy.py"
script = "$ace_root/build/tools/run_objcopy.py"
if (target_cpu == "x86_64") {
objcopy_tool = objcopy_x86_64
}

14
frameworks/core/BUILD.gn
View File

@ -249,10 +249,7 @@ template("ace_core_source_set") {
sources += [ "common/hdc_register.cpp" ]
}
configs = [
"$ace_root:ace_config",
"$ace_flutter_engine_root:flutter_config",
]
configs = [ "$ace_root:ace_config" ]
deps = [
"$skia_root_new:skia_$platform",
@ -821,10 +818,7 @@ template("ace_core_ng_source_set") {
sources -= [ "common/anr_thread.cpp" ]
}
configs = [
"$ace_root:ace_config",
"$ace_flutter_engine_root:flutter_config",
]
configs = [ "$ace_root:ace_config" ]
deps = [
"$ace_root/frameworks/core/components/theme:build_theme_code",
@ -833,10 +827,6 @@ template("ace_core_ng_source_set") {
]
external_deps = []
if (is_arkui_x) {
deps += [ "$ace_flutter_engine_root:flutter_for_ng" ]
}
if (defined(config.build_for_preview) && config.build_for_preview) {
sources -= [ "common/task_runner_adapter_impl.cpp" ]
}

2
frameworks/core/animation/test/unittest/framework/BUILD.gn
View File

@ -206,11 +206,9 @@ ohos_unittest("AnimationTest") {
configs = [
"$ace_root:ace_test_config",
":config_animation_test",
"$ace_flutter_engine_root:flutter_config",
]
deps = [
"$ace_flutter_engine_root/skia:ace_skia_ohos",
"$ace_root/frameworks/core/components/theme:build_theme_code",
"$cjson_root:cjson",
"//third_party/googletest:gtest_main",

2
frameworks/core/animation/test/unittest/spring_chain/BUILD.gn
View File

@ -209,11 +209,9 @@ ohos_unittest("SpringChainTest") {
configs = [
"$ace_root:ace_test_config",
":config_animation_test",
"$ace_flutter_engine_root:flutter_config",
]
deps = [
"$ace_flutter_engine_root/skia:ace_skia_ohos",
"$ace_root/frameworks/core/components/theme:build_theme_code",
"$cjson_root:cjson",
"//third_party/googletest:gtest_main",

2
frameworks/core/animation/test/unittest/svg_animate/BUILD.gn
View File

@ -209,11 +209,9 @@ ohos_unittest("SvgAnimateTest") {
configs = [
"$ace_root:ace_test_config",
":config_animation_test",
"$ace_flutter_engine_root:flutter_config",
]
deps = [
"$ace_flutter_engine_root/skia:ace_skia_ohos",
"$ace_root/frameworks/core/components/theme:build_theme_code",
"$cjson_root:cjson",
"//third_party/googletest:gtest_main",

16
frameworks/core/components/components.gni
View File

@ -47,10 +47,7 @@ template("build_component") {
sources += invoker.sources
configs = []
configs += [
"$ace_root:ace_config",
"$ace_flutter_engine_root:flutter_config",
]
configs += [ "$ace_root:ace_config" ]
if (defined(invoker.configs)) {
configs += invoker.configs
@ -63,21 +60,10 @@ template("build_component") {
deps = []
deps += extra_deps
deps += [
"$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform",
"$ace_root/frameworks/core/components/theme:build_theme_code",
"$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" ]
}
if (defined(use_rosen_drawing) && use_rosen_drawing) {
deps += [ "$ace_flutter_engine_root/icu:ace_libicu_$platform" ]
}
if (defined(invoker.public_configs)) {
public_configs = []
public_configs += invoker.public_configs

10
frameworks/core/components/theme/BUILD.gn
View File

@ -36,20 +36,12 @@ template("ace_core_components_theme_set") {
subsystem_name = ace_engine_subsystem
part_name = ace_engine_part
defines += invoker.defines
configs = [
"$ace_root:ace_config",
"$ace_flutter_engine_root:flutter_config",
]
configs = [ "$ace_root:ace_config" ]
deps = [
":build_theme_code",
"$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" ]
}
sources = [
"$root_out_dir/arkui/framework/core/components/theme/theme_constants_default.cpp",
"app_theme.cpp",

11
frameworks/core/components_ng/components.gni
View File

@ -106,16 +106,7 @@ template("build_component_ng") {
if (enable_graphic_text_gine) {
include_dirs += [ "//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export" ]
}
configs += [ "$ace_flutter_engine_root:flutter_config" ]
deps += [
"$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" ]
}
deps += [ "$skia_root_new:skia_$platform" ]
if (!is_arkui_x && defined(config.enable_drag_framework) &&
config.enable_drag_framework) {
external_deps += [ "device_status:devicestatus_client" ]

2
frameworks/core/components_ng/components_plugin.gni
View File

@ -110,8 +110,6 @@ template("build_component_plugin") {
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
]
configs += [ "$ace_flutter_engine_root:flutter_config" ]
# TODO: new skia configs
if (is_arkui_x) {

1
frameworks/core/image/animated_image_player.h
View File

@ -18,7 +18,6 @@
#include <unordered_map>
#include "flutter/fml/memory/ref_counted.h"
#include "include/codec/SkCodec.h"
#include "base/memory/ace_type.h"

6
frameworks/core/image/apng/BUILD.gn
View File

@ -36,14 +36,10 @@ template("ace_core_apng_source_set") {
"apng_image_player.cpp",
]
configs += [
"$ace_root:ace_config",
"$ace_flutter_engine_root:flutter_config",
]
configs += [ "$ace_root:ace_config" ]
defines += [ "APNG_IMAGE_SUPPORT" ]
deps = [
"$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform",
"$skia_root_new:skia_$platform",
"../../pipeline:ace_core_pipeline_$platform",
"../../pipeline_ng:ace_core_pipeline_ng_$platform",

1
frameworks/core/image/image_provider.h
View File

@ -18,7 +18,6 @@
#include <string>
#include "flutter/fml/memory/ref_counted.h"
#include "include/codec/SkCodec.h"
#ifdef USE_ROSEN_DRAWING
#include "draw/color.h"

6
frameworks/core/image/test/unittest/BUILD.gn
View File

@ -72,8 +72,6 @@ ohos_unittest("ImageCacheTest") {
]
deps = [
"$ace_flutter_engine_root:third_party_flutter_engine_ohos",
"$ace_flutter_engine_root/skia:ace_skia_ohos",
"$ace_root/adapter/ohos/osal:ace_osal_ohos_ohos",
"$ace_root/frameworks/base:ace_base_ohos",
"$ace_root/frameworks/base/resource:ace_resource",
@ -147,8 +145,6 @@ ohos_unittest("ImageProviderTest") {
]
deps = [
"$ace_flutter_engine_root:third_party_flutter_engine_ohos",
"$ace_flutter_engine_root/skia:ace_skia_ohos",
"$ace_root/adapter/ohos/osal:ace_osal_ohos_ohos",
"$ace_root/frameworks/base:ace_base_ohos",
"$ace_root/frameworks/base/resource:ace_resource",
@ -191,8 +187,6 @@ ohos_unittest("ImageCompressorTest") {
]
deps = [
"$ace_flutter_engine_root:third_party_flutter_engine_ohos",
"$ace_flutter_engine_root/skia:ace_skia_ohos",
"$ace_root/adapter/ohos/osal:ace_osal_ohos_ohos",
"$ace_root/frameworks/base:ace_base_ohos",
"$ace_root/frameworks/base/resource:ace_resource",

9
frameworks/core/pipeline/BUILD.gn
View File

@ -56,20 +56,13 @@ template("ace_core_pipeline_source_set") {
"base/factories/render_node_factory.cpp",
]
configs = [
"$ace_root:ace_config",
"$ace_flutter_engine_root:flutter_config",
]
configs = [ "$ace_root:ace_config" ]
deps = [
"$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform",
"$ace_root/frameworks/core/components/theme:build_theme_code",
"$skia_root_new:skia_$platform",
]
external_deps = []
if (enable_graphic_text_gine) {
deps -= [ "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform" ]
}
if (defined(config.enable_rosen_backend) && config.enable_rosen_backend) {
sources += [ "base/rosen_render_context.cpp" ]

10
frameworks/core/pipeline_ng/BUILD.gn
View File

@ -41,20 +41,13 @@ template("ace_core_pipeline_ng_source_set") {
"ui_task_scheduler.cpp",
]
configs = [
"$ace_root:ace_config",
"$ace_flutter_engine_root:flutter_config",
]
configs = [ "$ace_root:ace_config" ]
deps = [
"$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform",
"$ace_root/frameworks/core/components/theme:build_theme_code",
"$skia_root_new:skia_$platform",
]
external_deps = []
if (enable_graphic_text_gine) {
deps -= [ "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform" ]
}
if (defined(config.enable_rosen_backend) && config.enable_rosen_backend) {
if (is_arkui_x) {
@ -76,7 +69,6 @@ template("ace_core_pipeline_ng_source_set") {
if (platform == "ohos" && defined(config.enable_native_view) &&
config.enable_native_view) {
sources += [ "layers/ace_scene_builder.cpp" ]
deps += [ "$ace_flutter_engine_root/ohos_layers:flutter_ohos_layers" ]
}
cflags_cc = []

1
test/fuzztest/imageApi_fuzzer/BUILD.gn
View File

@ -126,7 +126,6 @@ ohos_fuzztest("ImageApiFuzzTest") {
"hilog:libhilog",
"init:libbegetutil",
]
deps += [ "$ace_flutter_engine_root/icu:ace_libicu_ohos" ]
} else {
external_deps = [
"hilog:libhilog",

26
test/mock/core/common/mock_flutter_window.cpp
View File

@ -1,26 +0,0 @@
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "flutter/lib/ui/window/window.h"
#include "flutter/runtime/window_manager.h"
namespace flutter {
Window* WindowManager::GetWindow(int32_t instance_id)
{
return nullptr;
}
void Window::ScheduleFrame() {}
} // namespace flutter

14
test/unittest/BUILD.gn
View File

@ -411,19 +411,7 @@ ohos_source_set("ace_core_extra") {
ohos_source_set("ace_engine_unittest_flutter_deps") {
testonly = true
sources = [ "$ace_root/test/mock/core/common/mock_flutter_window.cpp" ]
public_configs = [ "$ace_flutter_engine_root:flutter_config" ]
public_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",
]
}
public_deps = [ "$skia_root_new:skia_ohos" ]
cflags_cc = [ "-Wno-thread-safety-attributes" ]
external_deps = [ "eventhandler:libeventhandler" ]
}

17
test/unittest/ace_unittest.gni
View File

@ -74,22 +74,7 @@ template("ace_unittest") {
}
if (flutter_skia) {
flutter_sources +=
[ "$ace_root/test/mock/core/common/mock_flutter_window.cpp" ]
ace_unittest_deps += [
"$ace_flutter_engine_root:flutter_engine_common_ohos",
"$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" ]
ace_unittest_deps += [ "$skia_root_new:skia_ohos" ]
flutter_external_deps = [ "eventhandler:libeventhandler" ]
}