openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-27 09:12:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!34654 部件化编译整改--third

Browse Source 
Merge pull request !34654 from kangchongtao/0602
This commit is contained in:
openharmony_ci 2024-06-04 15:05:27 +00:00 committed by Gitee
commit e16aa3d77e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
36 changed files with 80 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,9 +81,7 @@ template("ace_ohos_standard_source_set") {
include_dirs = [ "$ace_root/interfaces/inner_api/ui_session" ]
deps = [ "$skia_root_new:skia_$platform" ]
deps += [
deps = [
"$ace_root/adapter/ohos/capability:ace_capability_ohos",
"$ace_root/interfaces/inner_api/ace:ace_uicontent",
"$ace_root/interfaces/inner_api/ui_session:ui_session",
@ -154,7 +152,6 @@ foreach(item, ace_platforms) {
platform = item.name
if (platform == "ohos" || platform == "ohos_ng") {
ace_ohos_standard_source_set("ace_ohos_standard_entrance_${platform}") {
platform = item.name
defines = []
cflags_cc = []
config = {

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

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

1
adapter/ohos/services/uiservice/test/unittest/phone/ui_mgr_service_test/BUILD.gn
View File

@ -12,7 +12,6 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_ohos_standard_system) {

1
adapter/ohos/services/uiservice/test/unittest/phone/ui_service_mgr_client_test/BUILD.gn
View File

@ -12,7 +12,6 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
if (is_ohos_standard_system) {

1
adapter/ohos/services/uiservice/test/unittest/phone/ui_service_mgr_proxy_test/BUILD.gn
View File

@ -12,7 +12,6 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
module_output_path = "ui_service/ui_service"

1
adapter/ohos/services/uiservice/test/unittest/phone/ui_service_mgr_stub_test/BUILD.gn
View File

@ -12,7 +12,6 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
module_output_path = "ui_service/ui_service"

1
adapter/ohos/services/uiservice/test/unittest/phone/ui_service_proxy_test/BUILD.gn
View File

@ -12,7 +12,6 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
module_output_path = "ui_service/ui_service"

1
adapter/ohos/services/uiservice/test/unittest/phone/ui_service_stub_test/BUILD.gn
View File

@ -12,7 +12,6 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
module_output_path = "ui_service/ui_service"

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

@ -64,7 +64,6 @@ ohos_source_set("preview_entrance_source") {
"$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 = [

25
bundle.json
View File

@ -77,7 +77,7 @@
"app_file_service",
"ets_utils",
"bounds_checking_function",
"libxml2",
"libxml2",
"ffrt",
"icu",
"miscdevice",
@ -87,12 +87,11 @@
"jsframework",
"opencl-headers",
"opengles",
"zlib"
],
"third_party": [
"zlib",
"skia",
"libuv"
]
],
"third_party": []
},
"build": {
"group_type": {
@ -145,7 +144,7 @@
},
{
"header": {
"header_base": "//foundation/arkui/ace_engine/interfaces/inner_api/drawable_descriptor/",
"header_base": "//foundation/arkui/ace_engine/interfaces/inner_api/drawable_descriptor",
"header_files": [
"drawable_descriptor.h"
]
@ -173,14 +172,14 @@
},
{
"header": {
"header_base": "//foundation/arkui/ace_engine/",
"header_base": "//foundation/arkui/ace_engine/interfaces/native",
"header_files": [
"interfaces/native/node/native_drawable_descriptor.h",
"interfaces/native/native_interface_xcomponent.h",
"interfaces/native/native_node.h",
"interfaces/native/native_interface.h",
"interfaces/native/native_type.h",
"interfaces/native/native_node_napi.h"
"node/native_drawable_descriptor.h",
"native_interface_xcomponent.h",
"native_node.h",
"native_interface.h",
"native_type.h",
"native_node_napi.h"
]
},
"name": "//foundation/arkui/ace_engine/interfaces/native:ace_ndk"

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

@ -19,12 +19,14 @@ template("ace_base_base64") {
source_set(target_name) {
defines += invoker.defines
cflags_cc += invoker.cflags_cc
deps = [ "$skia_root_new:skia_$platform" ]
include_dirs = []
sources = []
if (is_arkui_x) {
deps = [ "//third_party/skia:skia_canvaskit_static" ]
} else {
external_deps = [ "skia:skia_canvaskit" ]
}
# add base source file here
sources += [ "base64_util.cpp" ]
sources = [ "base64_util.cpp" ]
configs += [ "$ace_root:ace_config" ]
}
@ -32,7 +34,6 @@ template("ace_base_base64") {
foreach(item, ace_platforms) {
ace_base_base64("ace_base_base64_" + item.name) {
platform = item.name
defines = []
cflags_cc = []
config = {

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

@ -23,7 +23,13 @@ ohos_source_set("ace_resource") {
}
subsystem_name = ace_engine_subsystem
part_name = ace_engine_part
include_dirs = [ "//third_party/bounds_checking_function/include" ]
deps = []
external_deps = []
if (is_arkui_x) {
deps += [ "//third_party/bounds_checking_function:libsec_static" ]
} else {
external_deps += [ "bounds_checking_function:libsec_shared" ]
}
# add resource file here
sources = [
@ -34,11 +40,11 @@ ohos_source_set("ace_resource") {
]
if (current_os == "mac" || current_os == "mingw" || current_os == "ios" ||
current_os == "linux" || current_os == "android") {
deps = [ ":binary_resource_mac_and_windows" ]
deps += [ ":binary_resource_mac_and_windows" ]
sources += [ "internal_resource_previewer.cpp" ]
} else {
sources += [ "internal_resource.cpp" ]
deps = [ ":binary_resource" ]
deps += [ ":binary_resource" ]
}
configs = [ "$ace_root:ace_config" ]
@ -47,7 +53,7 @@ ohos_source_set("ace_resource") {
}
if (use_hilog) {
external_deps = [ "hilog:libhilog" ]
external_deps += [ "hilog:libhilog" ]
}
}

7
frameworks/bridge/declarative_frontend/BUILD.gn
View File

@ -589,14 +589,11 @@ template("declarative_js_engine") {
if (is_arkui_x) {
deps += [ "$ace_napi:ace_container_scope_static" ]
} else {
deps += [ "$ace_napi:ace_container_scope" ]
external_deps += [ "napi:ace_container_scope" ]
}
}
}
include_dirs +=
[ "//foundation/window/window_manager/interfaces/innerkits" ]
# add for cross_platfrom_build temporarily, shall be removed after external_deps is supported
if (is_arkui_x) {
configs += [ "$ark_ets_path:ark_jsruntime_public_config" ]
@ -995,7 +992,7 @@ template("declarative_js_engine_ng") {
}
if (defined(config.build_container_scope_lib) &&
config.build_container_scope_lib) {
deps += [ "$ace_napi:ace_container_scope" ]
external_deps += [ "napi:ace_container_scope" ]
}
}

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

@ -73,7 +73,6 @@ template("js_engine_ark") {
"jsi_stepper_bridge.cpp",
]
include_dirs = [ "//commonlibrary/c_utils/base/include" ]
cflags_cc = [ "-Wno-thread-safety-attributes" ]
# xcomponent components supports phone, TV and wearable except PC Preview
@ -93,10 +92,9 @@ template("js_engine_ark") {
external_deps = [ "hilog:libhilog" ]
}
if (defined(config.build_for_preview) && config.build_for_preview) {
deps += [
":gen_obj_src_abc_strip_native_min",
"//foundation/arkui/napi:ace_napi",
]
deps += [ ":gen_obj_src_abc_strip_native_min" ]
external_deps += [ "napi:ace_napi" ]
include_dirs = [ "//commonlibrary/c_utils/base/include" ]
} else if (defined(config.build_for_android) && config.build_for_android) {
deps += [
":gen_obj_src_abc_strip_native_min",

6
frameworks/core/BUILD.gn
View File

@ -262,7 +262,6 @@ template("ace_core_source_set") {
configs = [ "$ace_root:ace_config" ]
deps = [
"$skia_root_new:skia_$platform",
"pipeline:ace_core_pipeline_$platform",
"pipeline_ng:ace_core_pipeline_ng_$platform",
]
@ -537,8 +536,6 @@ template("ace_core_source_set") {
deps += [ "$ace_root/frameworks/core/components_ng/pattern/preview_mock:ace_core_components_preview_mock_pattern_ng_$platform" ]
}
include_dirs +=
[ "//foundation/window/window_manager/interfaces/innerkits" ]
if (is_arkui_x) {
include_dirs += [
"//foundation/appframework/ability/ability_runtime/cross_platform/frameworks/native/base/event_handler/include",
@ -572,7 +569,7 @@ template("ace_core_source_set") {
"common/rosen/rosen_asset_manager.cpp",
"common/rosen/rosen_window.cpp",
]
deps += [ "//third_party/libuv:uv" ]
external_deps += [ "libuv:uv" ]
}
if (defined(config.window_scene_support) && config.window_scene_support) {
@ -853,7 +850,6 @@ template("ace_core_ng_source_set") {
deps = [
"$ace_root/frameworks/core/components/theme:build_theme_code",
"$skia_root_new:skia_$platform",
"pipeline_ng:ace_core_pipeline_ng_$platform",
]

14
frameworks/core/components/camera/BUILD.gn
View File

@ -17,20 +17,6 @@ import(
config("standard_camera_config") {
cflags_cc = [ "-Wno-user-defined-warnings" ]
include_dirs = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include/",
"//drivers/peripheral/camera/interfaces/include/",
"//drivers/peripheral/camera/interfaces/include/callback/device/",
"//drivers/peripheral/camera/interfaces/include/callback/host/",
"//drivers/peripheral/camera/interfaces/include/callback/operator/",
"//drivers/peripheral/camera/interfaces/include/server/",
"//drivers/peripheral/camera/interfaces/metadata/include",
"//drivers/peripheral/codec/interfaces/include",
"//drivers/peripheral/display/interfaces/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//commonlibrary/c_utils/base/include",
]
}
if (enable_camera_framework && enable_player_framework) {

2
frameworks/core/components/camera/standard_system/camera.cpp
View File

@ -28,7 +28,6 @@
#include <unistd.h>
#include "base/log/log.h"
#include "display_type.h"
#include "core/image/image_file_cache.h"
@ -56,6 +55,7 @@ const char REGION_HEIGHT[] = "region_height";
constexpr int32_t DEFAULT_WIDTH = 640;
constexpr int32_t DEFAULT_HEIGHT = 480;
constexpr int32_t SURFACE_STRIDE_ALIGNMENT_VAL = 8;
constexpr int32_t PIXEL_FMT_RGBA_8888 = 12;
constexpr int32_t PREVIEW_SURFACE_WIDTH = 640;
constexpr int32_t PREVIEW_SURFACE_HEIGHT = 480;
constexpr int32_t PHOTO_SURFACE_WIDTH = 1280;

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

@ -59,10 +59,7 @@ template("build_component") {
}
deps = []
deps += extra_deps
deps += [
"$ace_root/frameworks/core/components/theme:build_theme_code",
"$skia_root_new:skia_$platform",
]
deps += [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
if (defined(invoker.public_configs)) {
public_configs = []

9
frameworks/core/components/plugin/BUILD.gn
View File

@ -32,12 +32,11 @@ build_component("plugin") {
rosen_sources = [ "rosen_render_plugin.cpp" ]
if (is_ohos_standard_system && !use_mingw_win && !use_mac && !use_linux) {
include_dirs = [
"//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager/include",
"//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
]
include_dirs =
[ "$ace_root/interfaces/inner_api/ui_service_manager/include" ]
deps = [ "//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr" ]
deps =
[ "$ace_root/interfaces/inner_api/ui_service_manager:ui_service_mgr" ]
external_deps = [
"ability_base:extractortool",

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

@ -37,10 +37,7 @@ template("ace_core_components_theme_set") {
part_name = ace_engine_part
defines += invoker.defines
configs = [ "$ace_root:ace_config" ]
deps = [
":build_theme_code",
"$skia_root_new:skia_$platform",
]
deps = [ ":build_theme_code" ]
sources = [
"$root_out_dir/arkui/framework/core/components/theme/theme_constants_default.cpp",
@ -76,7 +73,6 @@ foreach(item, ace_platforms) {
}
if (defined(config.defines)) {
defines = config.defines
platform = item.name
}
}
}

2
frameworks/core/components_ng/common_napi_utils/BUILD.gn
View File

@ -16,5 +16,5 @@ import("$ace_root/frameworks/core/components_ng/components.gni")
build_component_ng("common_napi_utils") {
sources = [ "common_napi_utils.cpp" ]
deps = [ "$ace_napi:ace_napi" ]
external_deps = [ "napi:ace_napi" ]
}

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

@ -115,12 +115,12 @@ template("build_component_ng") {
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include/",
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
]
deps += [ "//third_party/skia:skia_canvaskit_static" ]
defines += [ "CROSS_PLATFORM" ]
if (ace_enable_gpu) {
defines += [ "ACE_ENABLE_GPU" ]
}
}
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" ]
@ -156,11 +156,12 @@ template("build_component_ng") {
} else {
external_deps += [ "graphic_2d:librender_service_client" ]
}
include_dirs += [
"//foundation/window/window_manager",
"//foundation/window/window_manager/interfaces/innerkits",
]
if (use_mingw_win || use_mac || use_linux) {
include_dirs += [
"//foundation/window/window_manager",
"//foundation/window/window_manager/interfaces/innerkits",
]
}
}
if (defined(config.enable_standard_input) &&

8
frameworks/core/components_ng/pattern/security_component/BUILD.gn
View File

@ -13,12 +13,6 @@
import("../../components.gni")
if (is_standard_system) {
config("ohos_security_component_config") {
include_dirs = [ "//third_party/json/include" ]
}
}
build_component_ng("security_component_pattern_ng") {
sources = [
"location_button/location_button_model_ng.cpp",
@ -32,9 +26,7 @@ build_component_ng("security_component_pattern_ng") {
]
if (is_standard_system) {
configs = [ ":ohos_security_component_config" ]
external_deps = []
if (security_component_enable) {
sources += [
"security_component_handler.cpp",

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

@ -36,7 +36,6 @@ template("ace_core_apng_source_set") {
defines += [ "APNG_IMAGE_SUPPORT" ]
deps = [
"$skia_root_new:skia_$platform",
"../../pipeline:ace_core_pipeline_$platform",
"../../pipeline_ng:ace_core_pipeline_ng_$platform",
]

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

@ -58,10 +58,7 @@ template("ace_core_pipeline_source_set") {
configs = [ "$ace_root:ace_config" ]
deps = [
"$ace_root/frameworks/core/components/theme:build_theme_code",
"$skia_root_new:skia_$platform",
]
deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
external_deps = []
if (use_hilog) {
external_deps += [ "hilog:libhilog" ]
@ -85,8 +82,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 {

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

@ -43,10 +43,7 @@ template("ace_core_pipeline_ng_source_set") {
configs = [ "$ace_root:ace_config" ]
deps = [
"$ace_root/frameworks/core/components/theme:build_theme_code",
"$skia_root_new:skia_$platform",
]
deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
external_deps = []
if (use_hilog) {
external_deps += [ "hilog:libhilog" ]
@ -62,12 +59,8 @@ template("ace_core_pipeline_ng_source_set") {
}
deps += [ "$ace_root/frameworks/core/components_ng/render:ace_core_components_render_ng_$platform" ]
include_dirs = [
"//foundation/window/window_manager",
"//foundation/window/window_manager/interfaces/innerkits",
]
if (is_arkui_x) {
include_dirs += [
include_dirs = [
"//foundation/graphic/graphic_2d/utils/color_manager/export",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
]

12
interfaces/inner_api/ace/BUILD.gn
View File

@ -27,8 +27,11 @@ config("uicontent_public_config") {
config("uicontent_config") {
visibility = [ ":*" ]
include_dirs =
[ "//foundation/graphic/graphic_2d/rosen/modules/platform/utils" ]
if (use_mingw_win || use_mac || use_linux) {
include_dirs =
[ "//foundation/graphic/graphic_2d/rosen/modules/platform/utils" ]
}
if (!use_mingw_win && !use_mac && !use_linux) {
defines = uicast_configs.uicast_defines
}
@ -99,10 +102,7 @@ ohos_shared_library("ace_uicontent") {
}
ohos_shared_library("ace_forward_compatibility") {
include_dirs = [
"//base/startup/init/interfaces/innerkits/include/syspara",
"${ace_root}/frameworks",
]
include_dirs = [ "${ace_root}/frameworks" ]
public_configs = [ ":uicontent_public_config" ]

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

@ -16,16 +16,8 @@ import("//foundation/arkui/ace_engine/ace_config.gni")
config("drawable_config") {
include_dirs = [
"${ace_root}",
"${ace_root}/frameworks",
"${ace_root}/interfaces/napi/kits/utils",
"${ace_root}/adapter/ohos/osal",
"${ace_root}/frameworks/core/components_ng/render",
"${ace_root}/interfaces/frameworks",
"$ace_root/interfaces/inner_api",
"${ace_root}/interfaces/inner_api/drawable_descriptor",
"${ace_root}/interfaces/napi/kits/drawabledescriptor",
"${graphic_2d_path}/utils/color_manager/export",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
]
if (current_os != "ohos") {
include_dirs += [
@ -86,7 +78,6 @@ if (is_arkui_x) {
"js_drawable_descriptor.cpp",
]
deps = [ "$skia_root_new:skia_ohos" ]
defines = []
external_deps = [
"cJSON:cjson",
@ -98,11 +89,13 @@ if (is_arkui_x) {
if (current_os == "ohos") {
external_deps += [
"graphic_2d:2d_graphics",
"graphic_2d:color_manager",
"image_framework:image",
"image_framework:image_native",
"resource_management:global_resmgr",
]
public_external_deps = [
"graphic_2d:color_manager",
"image_framework:image_native",
]
} else {
defines += [ "PREVIEW" ]
if (use_mingw_win) {

5
interfaces/napi/kits/drag_controller/BUILD.gn
View File

@ -23,11 +23,6 @@ template("napi_dragcontroller_static") {
cflags_cc += invoker.cflags_cc
configs = [ "$ace_root/interfaces/napi/kits:ace_napi_config" ]
include_dirs = [
"$ark_ets_path",
"$ark_runtime_path",
]
sources = [ "js_drag_controller.cpp" ]
deps = [ "../utils:napi_utils_static_${platform}" ]
external_deps = []

6
interfaces/native/BUILD.gn
View File

@ -30,6 +30,10 @@ if (!is_arkui_x) {
}
}
config("ace_ndk_public_configs") {
include_dirs = [ "$ace_root/interfaces" ]
}
ohos_shared_library("ace_ndk") {
if (current_os == "ohos") {
sanitize = {
@ -44,6 +48,8 @@ ohos_shared_library("ace_ndk") {
"//foundation/arkui/ace_engine/interfaces/native",
]
public_configs = [ ":ace_ndk_public_configs" ]
sources = [
"//foundation/arkui/ace_engine/frameworks/core/components/common/properties/color.cpp",
"//foundation/arkui/ace_engine/frameworks/core/components/xcomponent/native_interface_xcomponent_impl.cpp",

1
test/unittest/BUILD.gn
View File

@ -443,7 +443,6 @@ ohos_source_set("ace_core_extra") {
ohos_source_set("ace_engine_unittest_flutter_deps") {
testonly = true
public_deps = [ "$skia_root_new:skia_ohos" ]
cflags_cc = [ "-Wno-thread-safety-attributes" ]
external_deps = [ "eventhandler:libeventhandler" ]
}

1
test/unittest/ace_unittest.gni
View File

@ -76,7 +76,6 @@ template("ace_unittest") {
}
if (flutter_skia) {
ace_unittest_deps += [ "$skia_root_new:skia_ohos" ]
flutter_external_deps = [ "eventhandler:libeventhandler" ]
}

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

@ -35,5 +35,7 @@ ohos_unittest("image_file_cache_test_ng") {
"//third_party/googletest:gmock_main",
]
external_deps = [ "skia:skia_canvaskit" ]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
}

1
test/unittest/core/pattern/custom_paint/BUILD.gn
View File

@ -12,7 +12,6 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("custom_paint_test_ng") {

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

@ -12,7 +12,6 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
config("config_svg_parse_test") {
@ -119,7 +118,6 @@ ohos_unittest("parse_test_ng") {
"$ace_root/test/unittest:ace_components_render",
"$ace_root/test/unittest:ace_core_animation",
"$ace_root/test/unittest:ace_core_extra",
"$skia_root_new:skia_ohos",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
]
@ -202,7 +200,6 @@ ohos_unittest("svg_dom_test_ng") {
"$ace_root/test/unittest:ace_components_render",
"$ace_root/test/unittest:ace_core_animation",
"$ace_root/test/unittest:ace_core_extra",
"$skia_root_new:skia_ohos",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest_main",
]

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

@ -32,17 +32,17 @@ ohos_unittest("ui_content_test") {
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/interfaces/inner_api/ace:ace_forward_compatibility",
"$ace_root/test/unittest:ace_engine_unittest_flutter_deps",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$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",
]
external_deps = [
"ability_runtime:abilitykit_native",
"cJSON:cjson",
"graphic_2d:librender_service_client",
"image_framework:image",
"input:libmmi-client",
"ipc:ipc_single",
@ -106,7 +106,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",
"$graphic_2d_path/rosen/modules/render_service_client:librender_service_client",
"//third_party/googletest:gmock_main",
]
@ -121,6 +120,7 @@ ohos_unittest("form_render_test") {
"c_utils:utils",
"eventhandler:libeventhandler",
"form_fwk:form_manager",
"graphic_2d:librender_service_client",
"graphic_surface:surface",
"hilog:libhilog",
"input:libmmi-client",
@ -179,7 +179,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",
"$graphic_2d_path/rosen/modules/render_service_client:librender_service_client",
"//third_party/googletest:gmock_main",
]
@ -194,6 +193,7 @@ ohos_unittest("form_render_group_test") {
"c_utils:utils",
"eventhandler:libeventhandler",
"form_fwk:form_manager",
"graphic_2d:librender_service_client",
"graphic_surface:surface",
"hilog:libhilog",
"input:libmmi-client",
@ -220,19 +220,13 @@ ohos_unittest("drawable_descriptor_test") {
"$ace_root/interfaces/inner_api/drawable_descriptor",
]
deps = [
"$skia_root_new:skia_ohos",
"//third_party/googletest:gmock_main",
]
public_deps = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
]
deps = [ "//third_party/googletest:gmock_main" ]
external_deps = [
"cJSON:cjson",
"c_utils:utils",
"graphic_2d:2d_graphics",
"graphic_2d:librender_service_client",
"hilog:libhilog",
"image_framework:image",
"image_framework:image_native",