surface依赖整改

Signed-off-by: 刘瓒 <liuzan9@huawei.com>
This commit is contained in:
刘瓒 2024-01-03 10:48:30 +08:00
parent 6c404409fd
commit 53776ebfd1
12 changed files with 12 additions and 13 deletions
bundle.json
dmserver
BUILD.gn
test/unittest
interfaces/kits/napi/screen_runtime
setresolution
test
common/utils
fuzztest/wms
windowscene_fuzzer
windowutilmath_fuzzer
systemtest/dms
utils
BUILD.gn
test/unittest
window_scene/interfaces/kits/napi/session_manager_service

@ -33,6 +33,7 @@
"sensor",
"ability_base",
"graphic_2d",
"graphic_surface",
"hisysevent",
"ability_runtime",
"napi",

@ -69,7 +69,7 @@ ohos_shared_library("libdms") {
"config_policy:configpolicy_util",
"eventhandler:libeventhandler",
"graphic_2d:librender_service_client",
"graphic_2d:surface",
"graphic_surface:surface",
"hilog:libhilog",
"hitrace:hitrace_meter",
"ipc:ipc_single",

@ -100,7 +100,7 @@ ohos_unittest("dmserver_display_manager_proxy_test") {
external_deps = [
"c_utils:utils",
"graphic_2d:surface",
"graphic_surface:surface",
"hilog:libhilog",
]

@ -47,7 +47,7 @@ ohos_shared_library("screen_napi") {
external_deps = [
"ability_runtime:runtime",
"c_utils:utils",
"graphic_2d:surface", # use for SurfaceUtils
"graphic_surface:surface", # use for SurfaceUtils
"hilog:libhilog",
"hiview:libxpower_event_js",
"napi:ace_napi",

@ -35,7 +35,7 @@ ohos_executable("setresolution_screen") {
external_deps = [
"c_utils:utils",
"graphic_2d:surface",
"graphic_surface:surface",
]
part_name = "window_manager"

@ -35,7 +35,7 @@ ohos_static_library("libtestutil") {
"access_token:libnativetoken",
"access_token:libtoken_setproc",
"c_utils:utils",
"graphic_2d:surface",
"graphic_surface:surface",
"hilog:libhilog",
"image_framework:image_native",
]

@ -25,7 +25,6 @@ ohos_fuzztest("WindowSceneFuzzTest") {
"../../../../wmserver/include",
"../../../../interfaces/innerkits/dm",
"../../../../interfaces/innerkits/wm",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"//commonlibrary/c_utils/base/include",
# for abilityContext

@ -26,7 +26,6 @@ ohos_fuzztest("WindowUtilMathFuzzTest") {
"../../../../utils/include",
"../../../../interfaces/innerkits/dm",
"../../../../interfaces/innerkits/wm",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"//commonlibrary/c_utils/base/include",
]

@ -160,7 +160,6 @@ config("dms_systemtest_common_public_config") {
"../../../utils/include",
# RSSurface
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client",
]
}
@ -195,6 +194,7 @@ ohos_static_library("dms_systemtest_common") {
"access_token:libnativetoken",
"access_token:libtoken_setproc",
"c_utils:utils",
"graphic_surface:surface",
"hilog:libhilog",
"ipc:ipc_single",
]

@ -87,7 +87,7 @@ ohos_static_library("libwmutil_static") {
"bundle_framework:appexecfwk_core",
"c_utils:utils",
"graphic_2d:librender_service_client",
"graphic_2d:surface",
"graphic_surface:surface",
"hilog:libhilog",
"hisysevent:libhisysevent",
"hitrace:hitrace_meter",
@ -179,7 +179,7 @@ ohos_shared_library("libwmutil") {
"c_utils:utils",
"graphic_2d:2d_graphics",
"graphic_2d:librender_service_client",
"graphic_2d:surface",
"graphic_surface:surface",
"hilog:libhilog",
"hisysevent:libhisysevent",
"hitrace:hitrace_meter",

@ -72,7 +72,7 @@ ohos_unittest("utils_screen_info_test") {
external_deps = [
"c_utils:utils",
"graphic_2d:surface",
"graphic_surface:surface",
"hilog:libhilog",
]
}
@ -86,7 +86,7 @@ ohos_unittest("utils_screen_group_info_test") {
external_deps = [
"c_utils:utils",
"graphic_2d:surface",
"graphic_surface:surface",
"hilog:libhilog",
]
}

@ -48,7 +48,7 @@ ohos_shared_library("sessionmanagerservice_napi") {
external_deps = [
"ability_runtime:runtime",
"c_utils:utils",
"graphic_2d:surface", # use for SurfaceUtils
"graphic_surface:surface", # use for SurfaceUtils
"hilog:libhilog",
"ipc:ipc_napi",
"napi:ace_napi",