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

部件独立编译整改

Browse Source 
Signed-off-by: kangchongtao <kangchongtao@huawei.com>
This commit is contained in:
kangchongtao 2024-05-27 07:16:54 +00:00
parent 61cc3f9e9e
commit fb0de7f3f0
40 changed files with 116 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ace_config.gni
View File

@ -95,10 +95,6 @@ ability_runtime_services_path = "${ability_runtime_path}/services"
accessibility_path = "//foundation/barrierfree/accessibility"
app_framework_resource_path = "${app_framework_root}/resource_management"
app_framework_window_path = "${app_framework_root}/window_manager"
flutter_root = "//third_party/flutter"
ace_flutter_engine_root = "$flutter_root/build"
expat_root = "//third_party/expat"
cjson_root = "//third_party/cJSON"
jsoncpp_root = "//third_party/jsoncpp"
ark_tools_root = "//prebuilts/ace-toolkit/ace-loader/panda"
node_js_path = "//prebuilts/ace-toolkit/nodejs/current/bin/"
@ -109,7 +105,10 @@ ark_ets_path = "//arkcompiler/ets_runtime"
crossplatform_plugin_root = "//plugins"
crossplatform_multimedia_root = "//foundation/multimedia"
skia_root_new = "//third_party/skia"
checking_function_root = "//third_party/bounds_checking_function"
# arkui-x
flutter_root = "//third_party/flutter"
ace_flutter_engine_root = "$flutter_root/build"
# Config toolchain
windows_buildtool = "//build/toolchain/mingw:mingw_x86_64"

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

@ -93,7 +93,6 @@ template("ace_ohos_standard_source_set") {
deps += [
"$ace_root/adapter/ohos/capability:ace_capability_ohos",
"$ace_root/interfaces/inner_api/ace:ace_uicontent",
"//third_party/zlib:shared_libz",
]
external_deps = [
@ -129,6 +128,7 @@ template("ace_ohos_standard_source_set") {
"window_manager:libwsutils",
"window_manager:scene_session",
"window_manager:screen_session_manager_client",
"zlib:shared_libz",
]
if (defined(config.enable_rosen_backend) && config.enable_rosen_backend) {

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

@ -68,7 +68,6 @@ ohos_source_set("preview_entrance_source") {
]
external_deps = []
include_dirs = [
"$flutter_root/engine",
"//foundation/window/window_manager",
"//foundation/ability/ability_runtime",
"//arkcompiler/ets_runtime",

1
adapter/preview/entrance/samples/BUILD.gn
View File

@ -49,7 +49,6 @@ foreach(device, ace_devices) {
include_dirs = [
"$ace_root",
"$ace_root/frameworks",
"$flutter_root/glfw/include",
"//foundation/window/window_manager",
"//ide/tools/previewer",
]

20
adapter/preview/osal/BUILD.gn
View File

@ -29,16 +29,9 @@ ohos_source_set("utilsecurec_source") {
defines += config.defines
}
if (platform == "windows") {
sources = [
"//third_party/bounds_checking_function/src/memset_s.c",
"//third_party/bounds_checking_function/src/securecutil.c",
"//third_party/bounds_checking_function/src/secureinput_w.c",
"//third_party/bounds_checking_function/src/secureprintoutput_a.c",
"//third_party/bounds_checking_function/src/secureprintoutput_w.c",
]
external_deps = [ "bounds_checking_function:libsec_shared" ]
cflags = [ "-Wno-inconsistent-dllimport" ]
}
configs = [ "//third_party/bounds_checking_function:libsec_public_config" ]
}
}
@ -107,7 +100,6 @@ ohos_source_set("preview_osal_source") {
deps = [
":utilsecurec_source",
"//foundation/graphic/graphic_2d/rosen/modules/platform:image_native",
"//third_party/curl:curl_shared",
]
if (ace_use_rosen_drawing) {
@ -117,13 +109,13 @@ ohos_source_set("preview_osal_source") {
]
}
external_deps = [ "hilog:libhilog" ]
configs = [
"$ace_root:ace_config",
"//third_party/curl:curl_config",
external_deps = [
"curl:curl_shared",
"hilog:libhilog",
]
configs = [ "$ace_root:ace_config" ]
include_dirs = [ "//commonlibrary/c_utils/base/include" ]
if (is_ohos_standard_system) {

10
build/ace_lib.gni
View File

@ -29,11 +29,11 @@ template("libace_static") {
}
deps = [ "$ace_root/frameworks/base:ace_base_$platform" ]
external_deps = []
if (use_mingw_win || use_mac || use_linux) {
deps += [
"//third_party/icu/icu4c:shared_icui18n",
"//third_party/icu/icu4c:shared_icuuc",
external_deps += [
"icu:shared_icui18n",
"icu:shared_icuuc",
]
}
@ -94,7 +94,7 @@ template("libace_static") {
}
configs = [ "$ace_root:ace_coverage_config" ]
if (use_hilog) {
external_deps = [ "hilog:libhilog" ]
external_deps += [ "hilog:libhilog" ]
}
part_name = ace_engine_part
subsystem_name = ace_engine_subsystem

20
bundle.json
View File

@ -77,23 +77,19 @@
"app_file_service",
"ets_utils",
"bounds_checking_function",
"ffrt"
],
"third_party": [
"json",
"skia",
"flutter",
"zlib",
"bounds_checking_function",
"curl",
"ffrt",
"icu",
"cJSON",
"curl",
"css-what",
"jsframework",
"opencl-headers",
"libuv",
"egl",
"opengles",
"icu"
"zlib"
],
"third_party": [
"skia",
"libuv"
]
},
"build": {

6
frameworks/base/BUILD.gn
View File

@ -34,6 +34,7 @@ template("ace_base_source_set") {
"resource:ace_resource",
]
external_deps = []
include_dirs = []
if (use_hilog) {
external_deps += [ "hilog:libhilog" ]
}
@ -77,7 +78,6 @@ template("ace_base_source_set") {
if (platform != "windows") {
# add secure c API
include_dirs = [ "//third_party/bounds_checking_function/include" ]
if (is_arkui_x) {
deps += [ "//third_party/bounds_checking_function:libsec_static" ]
}
@ -95,10 +95,10 @@ template("ace_base_source_set") {
external_deps += [ "graphic_2d:librender_service_client" ]
}
if (is_arkui_x || platform != "ohos") {
if (is_arkui_x) {
deps += [ "//third_party/cJSON:cjson_static" ]
} else {
deps += [ "//third_party/cJSON:cjson" ]
external_deps += [ "cJSON:cjson" ]
}
cflags_cc = []

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

@ -33,20 +33,27 @@ template("ace_base_i18n") {
configs = [
":ace_base_i18n_config",
"$ace_root:ace_config",
"//third_party/icu/icu4c:icu_config",
]
deps = [ "$ace_root/frameworks/base/resource:ace_resource" ]
external_deps = []
if (defined(config.use_external_icu) &&
config.use_external_icu == "static") {
deps += [
"//third_party/icu/icu4c:static_icui18n",
"//third_party/icu/icu4c:static_icuuc",
]
if (is_arkui_x) {
deps += [
"//third_party/icu/icu4c:static_icui18n",
"//third_party/icu/icu4c:static_icuuc",
]
} else {
external_deps += [
"icu:static_icui18n",
"icu:static_icuuc",
]
}
} else {
deps += [
"//third_party/icu/icu4c:shared_icui18n",
"//third_party/icu/icu4c:shared_icuuc",
external_deps += [
"icu:shared_icui18n",
"icu:shared_icuuc",
]
}
@ -57,7 +64,7 @@ template("ace_base_i18n") {
]
if (use_hilog) {
external_deps = [ "hilog:libhilog" ]
external_deps += [ "hilog:libhilog" ]
}
subsystem_name = ace_engine_subsystem

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

@ -17,8 +17,8 @@ import("//foundation/arkui/ace_engine/ace_config.gni")
ohos_shared_library("ace_network") {
sources = [ "download_manager_impl.cpp" ]
configs = [ "$ace_root:ace_config" ]
deps = [ "//third_party/curl:curl_shared" ]
external_deps = [
"curl:curl_shared",
"hilog:libhilog",
"netmanager_base:net_conn_manager_if",
"netmanager_base:net_conn_parcel",

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

@ -23,7 +23,7 @@ ohos_source_set("ace_resource") {
}
subsystem_name = ace_engine_subsystem
part_name = ace_engine_part
include_dirs = [ "//third_party/bounds_checking_function/include" ]
include_dirs = []
# add resource file here
sources = [
@ -34,6 +34,7 @@ ohos_source_set("ace_resource") {
]
if (current_os == "mac" || current_os == "mingw" || current_os == "ios" ||
current_os == "linux" || current_os == "android") {
include_dirs += [ "//third_party/bounds_checking_function/include" ]
deps = [ ":binary_resource_mac_and_windows" ]
sources += [ "internal_resource_previewer.cpp" ]
} else {

28
frameworks/bridge/js_frontend/engine/jsi/BUILD.gn
View File

@ -73,10 +73,7 @@ template("js_engine_ark") {
"jsi_stepper_bridge.cpp",
]
include_dirs = [
"$flutter_root/engine",
"$c_utils_root/base/include",
]
include_dirs = [ "$c_utils_root/base/include" ]
cflags_cc = [ "-Wno-thread-safety-attributes" ]
# xcomponent components supports phone, TV and wearable except PC Preview
@ -107,23 +104,18 @@ template("js_engine_ark") {
"//third_party/jsframework:ark_build",
]
} else if (defined(config.build_for_ios) && config.build_for_ios) {
deps += [
":gen_obj_src_abc_strip_native_min",
"//foundation/arkui/napi:ace_napi_static",
]
deps += [
"//third_party/css-what:css_what_sources",
"//third_party/jsframework:ark_build",
]
external_deps += [ "napi:ace_napi" ]
} else {
deps += [
"//third_party/css-what:css_what_sources",
"//third_party/jsframework:ark_build",
]
deps += [ ":gen_obj_src_abc_strip_native_min" ]
external_deps += [
"css-what:css_what_sources",
"jsframework:ark_build",
"napi:ace_napi",
]
} else {
external_deps += [
"css-what:css_what_sources",
"image_framework:image",
"image_framework:image_native",
"jsframework:ark_build",
"napi:ace_napi",
]
}

4
frameworks/core/BUILD.gn
View File

@ -424,7 +424,7 @@ template("ace_core_source_set") {
}
if (defined(config.enable_image_compression) &&
config.enable_image_compression) {
deps += [ "//third_party/opencl-headers:libcl" ]
external_deps += [ "opencl-headers:libcl" ]
defines += [ "ENABLE_OPENCL" ]
}
@ -1028,7 +1028,7 @@ template("ace_core_ng_source_set") {
if (defined(config.enable_image_compression) &&
config.enable_image_compression) {
deps += [ "//third_party/opencl-headers:libcl" ]
external_deps += [ "opencl-headers:libcl" ]
defines += [ "ENABLE_OPENCL" ]
}

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

@ -210,7 +210,6 @@ ohos_unittest("AnimationTest") {
deps = [
"$ace_root/frameworks/core/components/theme:build_theme_code",
"$cjson_root:cjson",
"//third_party/googletest:gtest_main",
]
if (!is_ohos_standard_system) {
@ -224,7 +223,10 @@ ohos_unittest("AnimationTest") {
[ "//base/global/resource_management/frameworks/resmgr:global_resmgr" ]
}
external_deps += [ "c_utils:utils" ]
external_deps += [
"cJSON:cjson",
"c_utils:utils",
]
part_name = ace_engine_part
}

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

@ -213,7 +213,6 @@ ohos_unittest("SpringChainTest") {
deps = [
"$ace_root/frameworks/core/components/theme:build_theme_code",
"$cjson_root:cjson",
"//third_party/googletest:gtest_main",
]
@ -229,7 +228,10 @@ ohos_unittest("SpringChainTest") {
external_deps = [ "hilog:libhilog" ]
}
external_deps += [ "c_utils:utils" ]
external_deps += [
"cJSON:cjson",
"c_utils:utils",
]
part_name = ace_engine_part
}

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

@ -213,7 +213,6 @@ ohos_unittest("SvgAnimateTest") {
deps = [
"$ace_root/frameworks/core/components/theme:build_theme_code",
"$cjson_root:cjson",
"//third_party/googletest:gtest_main",
]
@ -228,7 +227,10 @@ ohos_unittest("SvgAnimateTest") {
[ "//base/global/resource_management/frameworks/resmgr:global_resmgr" ]
}
external_deps += [ "c_utils:utils" ]
external_deps += [
"cJSON:cjson",
"c_utils:utils",
]
part_name = ace_engine_part
}

12
frameworks/core/components/font/BUILD.gn
View File

@ -27,16 +27,4 @@ build_component("font") {
"rosen_font_loader.cpp",
"rosen_font_manager.cpp",
]
# using graphcis_2d drawing lib
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine",
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"//third_party/bounds_checking_function/include",
]
}

5
frameworks/core/components/scene_viewer/BUILD.gn
View File

@ -24,10 +24,7 @@ config("scene_viewer_component_config") {
}
build_component("scene_viewer") {
configs = [
":scene_viewer_component_config",
"//commonlibrary/c_utils/base:utils_config",
]
configs = [ ":scene_viewer_component_config" ]
sources = [
"render_scene_viewer.cpp",

2
frameworks/core/components/text_overlay/BUILD.gn
View File

@ -49,7 +49,7 @@ build_component("text_overlay_for_web") {
external_deps = []
if (is_ohos_standard_system) {
deps = [ "//third_party/openGLES:libGLES" ]
external_deps += [ "opengles:libGLES" ]
}
rosen_sources = [ "rosen_render_text_overlay.cpp" ]

2
frameworks/core/components/web/BUILD.gn
View File

@ -48,7 +48,6 @@ build_component("web") {
if (is_ohos_standard_system) {
configs = [ ":ohos_web_config" ]
deps = [ "//third_party/openGLES:libGLES" ]
external_deps = [
"ability_runtime:abilitykit_native",
"ability_runtime:app_manager",
@ -57,6 +56,7 @@ build_component("web") {
"init:libbegetutil",
"ipc:ipc_core",
"napi:ace_napi",
"opengles:libGLES",
"webview:libnweb",
"window_manager:libwm",
]

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

@ -103,7 +103,6 @@ template("build_component_ng") {
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include/",
"//third_party/bounds_checking_function/include",
]
if (enable_graphic_text_gine) {
include_dirs += [ "//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export" ]
@ -136,8 +135,10 @@ template("build_component_ng") {
}
external_deps += [ "graphic_2d:librender_service_client" ]
if (platform == "ohos" || platform == "ohos_ng") {
deps += [ "//third_party/openGLES:libGLES" ]
external_deps += [ "graphic_2d:2d_graphics" ]
external_deps += [
"graphic_2d:2d_graphics",
"opengles:libGLES",
]
if (enable_graphic_text_gine) {
external_deps += [ "graphic_2d:rosen_text" ]
}

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

@ -107,7 +107,6 @@ template("build_component_plugin") {
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"//foundation/graphic/graphic_2d/rosen/modules",
"//third_party/bounds_checking_function/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client/core",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
]

2
frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.h
View File

@ -19,7 +19,7 @@
#include <memory>
#include <vector>
#include "../linear_layout/linear_layout_property.h"
#include "core/components_ng/pattern/linear_layout/linear_layout_property.h"
#include "core/components_ng/base/frame_node.h"
#include "core/components_ng/property/property.h"

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

@ -22,11 +22,7 @@ template("ace_core_apng_source_set") {
defines += invoker.defines
#add png support
include_dirs = [
"$flutter_root/skia/third_party/libpng",
"$flutter_root/skia/third_party/externals/libpng",
"//third_party/zlib",
]
include_dirs = [ "//third_party/zlib" ]
# apng support file
sources = [

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

@ -191,10 +191,12 @@ ohos_unittest("ImageCompressorTest") {
"$ace_root/frameworks/base:ace_base_ohos",
"$ace_root/frameworks/base/resource:ace_resource",
"//third_party/googletest:gtest_main",
"//third_party/opencl-headers:libcl",
]
defines = [ "ENABLE_OPENCL" ]
external_deps = [ "c_utils:utils" ]
external_deps = [
"c_utils:utils",
"opencl-headers:libcl",
]
part_name = ace_engine_part
resource_config_file = "//foundation/arkui/ace_engine/test/resource/graphicalbasicability/ohos_test.xml"
}

6
interfaces/inner_api/drawable_descriptor/BUILD.gn
View File

@ -86,12 +86,10 @@ if (is_arkui_x) {
"js_drawable_descriptor.cpp",
]
deps = [
"$cjson_root:cjson",
"$skia_root_new:skia_ohos",
]
deps = [ "$skia_root_new:skia_ohos" ]
defines = []
external_deps = [
"cJSON:cjson",
"graphic_2d:librender_service_client",
"hilog:libhilog",
"napi:ace_napi",

1
interfaces/inner_api/form_render/BUILD.gn
View File

@ -48,7 +48,6 @@ ohos_shared_library("ace_form_render") {
configs = [
"$ace_root:ace_config",
"$ace_root:ace_coverage_config",
"//commonlibrary/c_utils/base:utils_config",
]
public_configs = [ ":form_render_config" ]

26
interfaces/inner_api/ui_service_manager/BUILD.gn
View File

@ -12,7 +12,6 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
config("uiservice_manager_public_config") {
@ -20,18 +19,6 @@ config("uiservice_manager_public_config") {
include_dirs = [
"$ace_root/frameworks",
"include/",
"//drivers/peripheral/base",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client/core",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"//foundation/graphic/graphic_2d/interfaces/innerkits/common",
"//foundation/graphic/graphic_2d/utils/buffer_handle/export",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"$ability_runtime_innerkits_path/ability_manager/include/",
"$ability_runtime_path/interfaces/kits/native/ability/native",
"$ability_runtime_services_path/uiservicemgr/include",
"//commonlibrary/c_utils/base/include",
"//utils/system/safwk/native/include",
]
cflags = []
if (target_cpu == "arm") {
@ -47,22 +34,22 @@ ohos_shared_library("ui_service_mgr") {
debug = ace_sanitize_debug
}
}
sources = [
"//foundation/arkui/ace_engine/adapter/ohos/services/uiservice/src/ui_service_mgr_client.cpp",
"//foundation/arkui/ace_engine/adapter/ohos/services/uiservice/src/ui_service_mgr_proxy.cpp",
"//foundation/arkui/ace_engine/adapter/ohos/services/uiservice/src/ui_service_proxy.cpp",
"//foundation/arkui/ace_engine/adapter/ohos/services/uiservice/src/ui_service_stub.cpp",
"$ace_root/adapter/ohos/services/uiservice/src/ui_service_mgr_client.cpp",
"$ace_root/adapter/ohos/services/uiservice/src/ui_service_mgr_proxy.cpp",
"$ace_root/adapter/ohos/services/uiservice/src/ui_service_proxy.cpp",
"$ace_root/adapter/ohos/services/uiservice/src/ui_service_stub.cpp",
]
configs = [
"$ace_root:ace_config",
"$ace_root:ace_coverage_config",
"//commonlibrary/c_utils/base:utils_config",
]
public_configs = [
":uiservice_manager_public_config",
"//foundation/arkui/ace_engine/adapter/ohos/services/uiservice:uiservicems_config",
"$ace_root/adapter/ohos/services/uiservice:uiservicems_config",
]
external_deps = [
@ -71,6 +58,7 @@ ohos_shared_library("ui_service_mgr") {
"hilog:libhilog",
"ipc:ipc_core",
"samgr:samgr_proxy",
"window_manager:libwm",
]
subsystem_name = ace_engine_subsystem

9
interfaces/native/BUILD.gn
View File

@ -69,9 +69,8 @@ ohos_shared_library("ace_ndk") {
"node/style_modifier.cpp",
"node/waterflow_section_option.cpp",
]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
external_deps = [ "bounds_checking_function:libsec_shared" ]
deps = []
cflags_cc = [ "-Wno-missing-braces" ]
if (target_os == "ohos") {
@ -84,7 +83,7 @@ ohos_shared_library("ace_ndk") {
":libace_ndk_rom",
"$ace_root/interfaces/inner_api/drawable_descriptor:drawable_descriptor",
]
external_deps = [
external_deps += [
"graphic_2d:native_drawing_ndk",
"hilog:libhilog",
"image_framework:pixelmap",
@ -116,7 +115,7 @@ if (is_arkui_x) {
"native_interface_xcomponent.cpp",
]
deps = [ "$checking_function_root:libsec_static" ]
deps = [ "//third_party/bounds_checking_function:libsec_static" ]
cflags_cc = [ "-Wno-missing-braces" ]

12
test/unittest/BUILD.gn
View File

@ -107,8 +107,10 @@ ohos_source_set("ace_unittest_trace") {
"$ace_root/adapter/ohos/osal/ace_trace.cpp",
"$ace_root/frameworks/base/log/ace_trace.cpp",
]
deps = [ "//third_party/bounds_checking_function:libsec_static" ]
external_deps = [ "hitrace:hitrace_meter" ]
external_deps = [
"bounds_checking_function:libsec_static",
"hitrace:hitrace_meter",
]
configs = [ ":ace_unittest_config" ]
}
@ -1081,9 +1083,7 @@ ohos_source_set("ace_components_pattern") {
"$ace_root/test/mock/core/pattern/mock_web_pattern.cpp",
]
deps = [
"$ace_root/frameworks/core/components/theme:build_theme_code",
"//third_party/bounds_checking_function:libsec_static",
]
deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
external_deps = [ "bounds_checking_function:libsec_static" ]
configs = [ ":ace_unittest_config" ]
}

2
test/unittest/bridge/common/sourcemap/BUILD.gn
View File

@ -32,6 +32,6 @@ ohos_unittest("bridge_source_map_test") {
"$ace_root/test/unittest:ace_base",
"$ace_root/test/unittest:ace_components_mock",
"$ace_root/test/unittest:ace_core_animation",
"$cjson_root:cjson",
]
external_deps = [ "cJSON:cjson" ]
}

2
test/unittest/bridge/common/utils/BUILD.gn
View File

@ -31,6 +31,6 @@ ohos_unittest("bridge_utils_test") {
"$ace_root/test/unittest:ace_base",
"$ace_root/test/unittest:ace_components_mock",
"$ace_root/test/unittest:ace_core_animation",
"$cjson_root:cjson",
]
external_deps = [ "cJSON:cjson" ]
}

3
test/unittest/core/common/ace_engine/BUILD.gn
View File

@ -102,10 +102,9 @@ ohos_unittest("ace_engine_special_test") {
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/googletest:gmock_main",
]
external_deps = [ "cJSON:cjson" ]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
}

2
test/unittest/core/common/form/BUILD.gn
View File

@ -28,10 +28,10 @@ ohos_unittest("form_manager_test") {
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$cjson_root:cjson_static",
"//third_party/googletest:gmock_main",
]
external_deps = [
"cJSON:cjson",
"c_utils:utils",
"hilog:libhilog",
]

2
test/unittest/core/common/plugin/BUILD.gn
View File

@ -28,10 +28,10 @@ ohos_unittest("plugin_manager_test") {
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$cjson_root:cjson_static",
"//third_party/googletest:gmock_main",
]
external_deps = [
"cJSON:cjson",
"c_utils:utils",
"hilog:libhilog",
]

2
test/unittest/core/image_provider/BUILD.gn
View File

@ -77,10 +77,10 @@ ohos_unittest("image_provider_test_ng") {
"$ace_root/test/unittest:ace_engine_unittest_flutter_deps",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson_static",
"$graphic_2d_path/rosen/modules/render_service_base:librender_service_base",
"//third_party/googletest:gmock_main",
]
external_deps = [ "cJSON:cjson" ]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
}

5
test/unittest/core/pattern/canvas_renderer/BUILD.gn
View File

@ -89,11 +89,6 @@ config("config_canvas_renderer_test") {
include_dirs = [
"$ace_root",
"$ace_root/frameworks",
"$flutter_root/skia",
"$flutter_root/engine",
"$flutter_root/engine/flutter",
"$flutter_root/engine/flutter/third_party/txt/src",
"$flutter_root/skia/third_party/externals/harfbuzz/src",
]
cflags_cc = [ "-w" ]
}

4
test/unittest/core/pattern/plugin/BUILD.gn
View File

@ -126,9 +126,7 @@ ohos_unittest("plugin_pattern_test_ng") {
"$ace_root/interfaces/inner_api/ui_service_manager:ui_service_mgr",
"$ace_root/test/unittest:ace_engine_unittest_flutter_deps",
"$ace_root/test/unittest:ace_unittest_log",
"$cjson_root:cjson_static",
"//third_party/googletest:gmock_main",
"//third_party/zlib:shared_libz",
]
if (ace_use_rosen_drawing) {
@ -138,6 +136,7 @@ ohos_unittest("plugin_pattern_test_ng") {
}
external_deps = [
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:librender_service_client",
"hilog:libhilog",
@ -148,6 +147,7 @@ ohos_unittest("plugin_pattern_test_ng") {
"window_manager:scene_session_manager",
"window_manager:screen_session",
"window_manager:screen_session_manager_client",
"zlib:shared_libz",
]
if (os_account_exists) {

4
test/unittest/core/svg/BUILD.gn
View File

@ -105,6 +105,7 @@ ohos_unittest("parse_test_ng") {
]
external_deps = [
"bounds_checking_function:libsec_static",
"eventhandler:libeventhandler",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
@ -119,7 +120,6 @@ ohos_unittest("parse_test_ng") {
"$ace_root/test/unittest:ace_core_animation",
"$ace_root/test/unittest:ace_core_extra",
"$skia_root_new:skia_ohos",
"//third_party/bounds_checking_function:libsec_static",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
]
@ -188,6 +188,7 @@ ohos_unittest("svg_dom_test_ng") {
]
external_deps = [
"bounds_checking_function:libsec_static",
"eventhandler:libeventhandler",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
@ -202,7 +203,6 @@ ohos_unittest("svg_dom_test_ng") {
"$ace_root/test/unittest:ace_core_animation",
"$ace_root/test/unittest:ace_core_extra",
"$skia_root_new:skia_ohos",
"//third_party/bounds_checking_function:libsec_static",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
]

8
test/unittest/interfaces/BUILD.gn
View File

@ -41,7 +41,6 @@ ohos_unittest("ui_content_test") {
"$ace_root/test/unittest:ace_engine_unittest_flutter_deps",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"$graphic_2d_path/rosen/modules/render_service_client:librender_service_client",
"${ace_root}/interfaces/inner_api/ace:ace_forward_compatibility",
"//third_party/googletest:gmock_main",
@ -49,6 +48,7 @@ ohos_unittest("ui_content_test") {
external_deps = [
"ability_runtime:abilitykit_native",
"cJSON:cjson",
"image_framework:image",
"input:libmmi-client",
"ipc:ipc_single",
@ -115,7 +115,6 @@ ohos_unittest("form_render_test") {
"$ace_root/test/unittest:ace_engine_unittest_flutter_deps",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"$graphic_2d_path/rosen/modules/render_service_client:librender_service_client",
"//third_party/googletest:gmock_main",
]
@ -127,6 +126,7 @@ ohos_unittest("form_render_test") {
"ability_runtime:runtime",
"accessibility:accessibility_common",
"ace_engine:ace_uicontent",
"cJSON:cjson",
"c_utils:utils",
"eventhandler:libeventhandler",
"form_fwk:form_manager",
@ -191,7 +191,6 @@ ohos_unittest("form_render_group_test") {
"$ace_root/test/unittest:ace_engine_unittest_flutter_deps",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"$graphic_2d_path/rosen/modules/render_service_client:librender_service_client",
"//third_party/googletest:gmock_main",
]
@ -203,6 +202,7 @@ ohos_unittest("form_render_group_test") {
"ability_runtime:runtime",
"accessibility:accessibility_common",
"ace_engine:ace_uicontent",
"cJSON:cjson",
"c_utils:utils",
"eventhandler:libeventhandler",
"form_fwk:form_manager",
@ -227,7 +227,6 @@ ohos_unittest("drawable_descriptor_test") {
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
deps = [
"$cjson_root:cjson",
"$skia_root_new:skia_ohos",
"//third_party/googletest:gmock_main",
]
@ -238,6 +237,7 @@ ohos_unittest("drawable_descriptor_test") {
]
external_deps = [
"cJSON:cjson",
"c_utils:utils",
"hilog:libhilog",
"image_framework:image",