From ea6e5a98119ddf79d2e9c88b1fb18df844c6e2d6 Mon Sep 17 00:00:00 2001 From: huangxiaolinabc123 Date: Mon, 1 Aug 2022 17:12:37 +0800 Subject: [PATCH] modify samgr Signed-off-by: huangxiaolinabc123 Change-Id: I9419cc44ce778f46c364abca424f8fb1c308a629 --- bundle.json | 2 +- dm/BUILD.gn | 2 +- dmserver/BUILD.gn | 2 +- interfaces/innerkits/BUILD.gn | 2 +- test/fuzztest/dms/displaymanageripc_fuzzer/BUILD.gn | 2 +- test/fuzztest/wms/windowipc_fuzzer/BUILD.gn | 2 +- wm/BUILD.gn | 2 +- wm/test/unittest/BUILD.gn | 2 +- wmserver/BUILD.gn | 2 +- wmserver/test/unittest/BUILD.gn | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bundle.json b/bundle.json index dfd3d40e..8ccf7b5e 100644 --- a/bundle.json +++ b/bundle.json @@ -40,7 +40,7 @@ "utils_base", "hitrace_native", "resource_management", - "samgr_standard", + "samgr", "input", "safwk", "display_manager", diff --git a/dm/BUILD.gn b/dm/BUILD.gn index a8d25af4..03b64954 100644 --- a/dm/BUILD.gn +++ b/dm/BUILD.gn @@ -59,7 +59,7 @@ ohos_shared_library("libdm") { "ipc:ipc_core", "multimedia_image_standard:image_native", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] part_name = "window_manager" diff --git a/dmserver/BUILD.gn b/dmserver/BUILD.gn index cb6a8e70..26f784dc 100644 --- a/dmserver/BUILD.gn +++ b/dmserver/BUILD.gn @@ -67,7 +67,7 @@ ohos_shared_library("libdms") { "hitrace_native:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "sensor:sensor_interface_native", ] diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index 5b58de60..613e1b3d 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -25,10 +25,10 @@ ohos_shared_library("wm_interface") { public_deps = [ "//commonlibrary/c_utils/base:utils", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] part_name = "window_manager" diff --git a/test/fuzztest/dms/displaymanageripc_fuzzer/BUILD.gn b/test/fuzztest/dms/displaymanageripc_fuzzer/BUILD.gn index 2f04e66d..eef2a45e 100644 --- a/test/fuzztest/dms/displaymanageripc_fuzzer/BUILD.gn +++ b/test/fuzztest/dms/displaymanageripc_fuzzer/BUILD.gn @@ -36,7 +36,7 @@ ohos_fuzztest("DisplayManagerIPCFuzzTest") { "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//foundation/window/window_manager/dm:libdm", ] - external_deps = [ "samgr_standard:samgr_proxy" ] + external_deps = [ "samgr:samgr_proxy" ] } ############################################################################### diff --git a/test/fuzztest/wms/windowipc_fuzzer/BUILD.gn b/test/fuzztest/wms/windowipc_fuzzer/BUILD.gn index f318cbbd..e61727bb 100644 --- a/test/fuzztest/wms/windowipc_fuzzer/BUILD.gn +++ b/test/fuzztest/wms/windowipc_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("WindowIPCFuzzTest") { external_deps = [ "ability_runtime:ability_manager", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/wm/BUILD.gn b/wm/BUILD.gn index 6e56f965..9ac27fad 100644 --- a/wm/BUILD.gn +++ b/wm/BUILD.gn @@ -94,7 +94,7 @@ ohos_shared_library("libwm") { "c_utils:utils", "resource_management:global_resmgr", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] defines = [] diff --git a/wm/test/unittest/BUILD.gn b/wm/test/unittest/BUILD.gn index df48d04a..f187ab50 100644 --- a/wm/test/unittest/BUILD.gn +++ b/wm/test/unittest/BUILD.gn @@ -143,10 +143,10 @@ ohos_static_library("wm_unittest_common") { "//commonlibrary/c_utils/base:utils", "//foundation/arkui/ace_engine/interfaces/inner_api/ace:ace_uicontent", "//foundation/arkui/napi:ace_napi", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/graphic/graphic_2d/rosen/modules/animation/window_animation:window_animation", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", + "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/window/window_manager/dm:libdm", "//foundation/window/window_manager/dmserver:libdms", "//foundation/window/window_manager/utils:libwmutil", diff --git a/wmserver/BUILD.gn b/wmserver/BUILD.gn index c88efb0b..16418ef8 100644 --- a/wmserver/BUILD.gn +++ b/wmserver/BUILD.gn @@ -96,7 +96,7 @@ ohos_shared_library("libwms") { "ipc:ipc_core", "power_manager:powermgr_client", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] if (is_standard_system) { diff --git a/wmserver/test/unittest/BUILD.gn b/wmserver/test/unittest/BUILD.gn index 9a5cc87c..9207ebdc 100644 --- a/wmserver/test/unittest/BUILD.gn +++ b/wmserver/test/unittest/BUILD.gn @@ -78,10 +78,10 @@ ohos_static_library("wmserver_unittest_common") { "//commonlibrary/c_utils/base:utils", "//foundation/arkui/ace_engine/interfaces/inner_api/ace:ace_uicontent", "//foundation/arkui/napi:ace_napi", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/graphic/graphic_2d/rosen/modules/animation/window_animation:window_animation", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", + "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/window/window_manager/dm:libdm", "//foundation/window/window_manager/dmserver:libdms", "//foundation/window/window_manager/utils:libwmutil",