diff --git a/dm/test/systemtest/BUILD.gn b/dm/test/systemtest/BUILD.gn index fcd59432..25607c70 100644 --- a/dm/test/systemtest/BUILD.gn +++ b/dm/test/systemtest/BUILD.gn @@ -145,7 +145,6 @@ ohos_static_library("dm_systemtest_common") { "//foundation/windowmanager/dmserver:libdms", "//foundation/windowmanager/utils:libwmutil", "//foundation/windowmanager/wm:libwm", - "//foundation/windowmanager/wmserver:libwms", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/dm/test/unittest/BUILD.gn b/dm/test/unittest/BUILD.gn index c4cd8f5f..eef138d7 100644 --- a/dm/test/unittest/BUILD.gn +++ b/dm/test/unittest/BUILD.gn @@ -132,7 +132,6 @@ ohos_static_library("dm_unittest_common") { "//foundation/windowmanager/snapshot:snapshot_display", "//foundation/windowmanager/utils:libwmutil", "//foundation/windowmanager/wm:libwm", - "//foundation/windowmanager/wmserver:libwms", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", "//third_party/libpng:libpng", # png diff --git a/interfaces/kits/napi/window_runtime/BUILD.gn b/interfaces/kits/napi/window_runtime/BUILD.gn index b077157a..cf31cde7 100644 --- a/interfaces/kits/napi/window_runtime/BUILD.gn +++ b/interfaces/kits/napi/window_runtime/BUILD.gn @@ -53,7 +53,6 @@ ohos_shared_library("window_native_kit") { "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//foundation/windowmanager/utils:libwmutil", "//foundation/windowmanager/wm:libwm", - "//foundation/windowmanager/wmserver:libwms", ] external_deps = [ @@ -83,7 +82,6 @@ ohos_shared_library("window_napi") { "${ability_runtime_path}/frameworks/native/appkit:appkit_native", "//foundation/windowmanager/utils:libwmutil", "//foundation/windowmanager/wm:libwm", - "//foundation/windowmanager/wmserver:libwms", "//utils/native/base:utils", ] @@ -111,13 +109,13 @@ ohos_shared_library("windowstage_kit") { ":window_native_kit", "//foundation/windowmanager/utils:libwmutil", "//foundation/windowmanager/wm:libwm", - "//foundation/windowmanager/wmserver:libwms", ] external_deps = [ "ability_runtime:ability_manager", "ability_runtime:runtime", "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", "napi:ace_napi", "utils_base:utils", ] diff --git a/wm/test/fuzztest/window_fuzzer/BUILD.gn b/wm/test/fuzztest/window_fuzzer/BUILD.gn index 67190c9f..c2fac720 100644 --- a/wm/test/fuzztest/window_fuzzer/BUILD.gn +++ b/wm/test/fuzztest/window_fuzzer/BUILD.gn @@ -34,9 +34,10 @@ ohos_fuzztest("WindowFuzzTest") { sources = [ "window_fuzzer.cpp" ] deps = [ "//foundation/windowmanager/wm:libwm", - "//foundation/windowmanager/wmserver:libwms", "//utils/native/base:utils", ] + + external_deps = [ "ipc:ipc_core" ] } ############################################################################### diff --git a/wm/test/fuzztest/windowmanager_fuzzer/BUILD.gn b/wm/test/fuzztest/windowmanager_fuzzer/BUILD.gn index 0e637c9a..80149263 100644 --- a/wm/test/fuzztest/windowmanager_fuzzer/BUILD.gn +++ b/wm/test/fuzztest/windowmanager_fuzzer/BUILD.gn @@ -35,9 +35,10 @@ ohos_fuzztest("WindowManagerFuzzTest") { sources = [ "windowmanager_fuzzer.cpp" ] deps = [ "//foundation/windowmanager/wm:libwm", - "//foundation/windowmanager/wmserver:libwms", "//utils/native/base:utils", ] + + external_deps = [ "ipc:ipc_core" ] } ############################################################################### diff --git a/wm/test/fuzztest/windowscene_fuzzer/BUILD.gn b/wm/test/fuzztest/windowscene_fuzzer/BUILD.gn index 50840542..129b5673 100644 --- a/wm/test/fuzztest/windowscene_fuzzer/BUILD.gn +++ b/wm/test/fuzztest/windowscene_fuzzer/BUILD.gn @@ -39,9 +39,10 @@ ohos_fuzztest("WindowSceneFuzzTest") { "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//foundation/windowmanager/dm:libdm", "//foundation/windowmanager/wm:libwm", - "//foundation/windowmanager/wmserver:libwms", "//utils/native/base:utils", ] + + external_deps = [ "ipc:ipc_core" ] } ############################################################################### diff --git a/wm/test/systemtest/BUILD.gn b/wm/test/systemtest/BUILD.gn index 3b239fec..b1bb29c5 100644 --- a/wm/test/systemtest/BUILD.gn +++ b/wm/test/systemtest/BUILD.gn @@ -308,7 +308,6 @@ ohos_static_library("wm_systemtest_common") { "//foundation/windowmanager/dmserver:libdms", "//foundation/windowmanager/utils:libwmutil", "//foundation/windowmanager/wm:libwm", - "//foundation/windowmanager/wmserver:libwms", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -319,6 +318,7 @@ ohos_static_library("wm_systemtest_common") { "ability_base:zuri", "ability_runtime:ability_context_native", "bundle_framework:appexecfwk_base", + "ipc:ipc_core", ] } ## Build wm_systemtest_common.a }}} diff --git a/wm/test/unittest/BUILD.gn b/wm/test/unittest/BUILD.gn index 961d0a97..3da98492 100644 --- a/wm/test/unittest/BUILD.gn +++ b/wm/test/unittest/BUILD.gn @@ -195,6 +195,7 @@ ohos_static_library("wm_unittest_common") { "ability_base:want", "ability_runtime:ability_context_native", "bundle_framework:appexecfwk_base", + "ipc:ipc_core", ] } ## Build wm_unittest_common.a }}} diff --git a/wmserver/BUILD.gn b/wmserver/BUILD.gn index b50cb841..a768f34a 100644 --- a/wmserver/BUILD.gn +++ b/wmserver/BUILD.gn @@ -74,12 +74,6 @@ ohos_shared_library("libwms") { "//foundation/windowmanager/dmserver:libdms", "//foundation/windowmanager/utils:libwmutil", "//foundation/windowmanager/wm:libwm", - "//third_party/libxml2:xml2", - ] - - public_deps = [ - # IMS libdms need delete it - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", ] external_deps = [