From 1cd631f2dfc7a02fa936fc6cf44bcfb99e0e4ce8 Mon Sep 17 00:00:00 2001
From: huangxiaolinabc123 <huangxiaolin12@huawei.com>
Date: Mon, 1 Aug 2022 11:15:31 +0800
Subject: [PATCH] modify samgr

Signed-off-by: huangxiaolinabc123 <huangxiaolin12@huawei.com>
Change-Id: I5c5a932a2061ca78d58da69ca324986486f69d20
---
 bundle.json                                                   | 2 +-
 interfaces/innerkits/native_cpp/screen_sink/BUILD.gn          | 2 +-
 interfaces/innerkits/native_cpp/screen_source/BUILD.gn        | 2 +-
 .../dscreen_sink_handler/handlerinitsink_fuzzer/BUILD.gn      | 2 +-
 .../handleronremotesinksvrdied_fuzzer/BUILD.gn                | 2 +-
 .../handlersubscribelocalhardware_fuzzer/BUILD.gn             | 2 +-
 .../handlerunsubscribelocalhardware_fuzzer/BUILD.gn           | 2 +-
 .../fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer/BUILD.gn | 2 +-
 .../proxysubscribelocalhardware_fuzzer/BUILD.gn               | 2 +-
 .../proxyunsubscribelocalhardware_fuzzer/BUILD.gn             | 2 +-
 .../dscreen_sink_proxy/sinkproxydscreennotify_fuzzer/BUILD.gn | 2 +-
 .../handlerconfigdistributedhardware_fuzzer/BUILD.gn          | 2 +-
 .../dscreen_source_handler/handlerinitsource_fuzzer/BUILD.gn  | 2 +-
 .../handleronremotesourcesvrdied_fuzzer/BUILD.gn              | 2 +-
 .../handlerregisterdistributedhardware_fuzzer/BUILD.gn        | 2 +-
 .../handlerunregisterdistributedhardware_fuzzer/BUILD.gn      | 2 +-
 .../proxyconfigdistributedhardware_fuzzer/BUILD.gn            | 2 +-
 .../dscreen_source_proxy/proxydscreennotify_fuzzer/BUILD.gn   | 2 +-
 .../dscreen_source_proxy/proxyinitsource_fuzzer/BUILD.gn      | 2 +-
 .../proxyregisterdistributedhardware_fuzzer/BUILD.gn          | 2 +-
 .../proxyunregisterdistributedhardware_fuzzer/BUILD.gn        | 2 +-
 .../native_cpp/test/unittest/screensinktest/BUILD.gn          | 4 ++--
 .../native_cpp/test/unittest/screensourcetest/BUILD.gn        | 4 ++--
 screenhandler/BUILD.gn                                        | 2 +-
 screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn    | 2 +-
 .../test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn      | 2 +-
 screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn  | 2 +-
 services/screenclient/BUILD.gn                                | 2 +-
 services/screendemo/BUILD.gn                                  | 2 +-
 services/screenservice/sinkservice/BUILD.gn                   | 2 +-
 services/screenservice/sourceservice/BUILD.gn                 | 2 +-
 31 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/bundle.json b/bundle.json
index 830f38fb..385d5b51 100644
--- a/bundle.json
+++ b/bundle.json
@@ -34,7 +34,7 @@
                 "hiviewdfx_hilog_native",
                 "input",
                 "graphic_standard",
-                "samgr_standard",
+                "samgr",
                 "safwk",
                 "hitrace_native",
                 "c_utils",
diff --git a/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn
index b105eda8..4d3ad6de 100644
--- a/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn
@@ -50,7 +50,7 @@ ohos_shared_library("distributed_screen_sink_sdk") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 
   subsystem_name = "distributedhardware"
diff --git a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn
index b98dbeae..86122775 100644
--- a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn
@@ -52,7 +52,7 @@ ohos_shared_library("distributed_screen_source_sdk") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 
   subsystem_name = "distributedhardware"
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerinitsink_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerinitsink_fuzzer/BUILD.gn
index 5000c382..140a766a 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerinitsink_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerinitsink_fuzzer/BUILD.gn
@@ -59,7 +59,7 @@ ohos_fuzztest("HandlerInitSinkFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handleronremotesinksvrdied_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handleronremotesinksvrdied_fuzzer/BUILD.gn
index abaf00f7..687e5b8d 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handleronremotesinksvrdied_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handleronremotesinksvrdied_fuzzer/BUILD.gn
@@ -59,7 +59,7 @@ ohos_fuzztest("HandlerOnRemoteSinkSvrDiedFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlersubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlersubscribelocalhardware_fuzzer/BUILD.gn
index 1a19325d..c248a0af 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlersubscribelocalhardware_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlersubscribelocalhardware_fuzzer/BUILD.gn
@@ -59,7 +59,7 @@ ohos_fuzztest("HandlerSubscribeLocalHardwareFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerunsubscribelocalhardware_fuzzer/BUILD.gn
index d7b51715..2e00cf10 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerunsubscribelocalhardware_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerunsubscribelocalhardware_fuzzer/BUILD.gn
@@ -59,7 +59,7 @@ ohos_fuzztest("HandlerUnsubscribeLocalHardwareFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer/BUILD.gn
index 47dd1ace..7ad4c5bb 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer/BUILD.gn
@@ -59,7 +59,7 @@ ohos_fuzztest("ProxyInitSinkFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxysubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxysubscribelocalhardware_fuzzer/BUILD.gn
index 6f2231b2..4f3951e7 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxysubscribelocalhardware_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxysubscribelocalhardware_fuzzer/BUILD.gn
@@ -59,7 +59,7 @@ ohos_fuzztest("ProxySubscribeLocalHardwareFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyunsubscribelocalhardware_fuzzer/BUILD.gn
index 763abc88..5d36af55 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyunsubscribelocalhardware_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyunsubscribelocalhardware_fuzzer/BUILD.gn
@@ -59,7 +59,7 @@ ohos_fuzztest("ProxyUnsubscribeLocalHardwareFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/sinkproxydscreennotify_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/sinkproxydscreennotify_fuzzer/BUILD.gn
index b3d6bda0..0ba80693 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/sinkproxydscreennotify_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/sinkproxydscreennotify_fuzzer/BUILD.gn
@@ -59,7 +59,7 @@ ohos_fuzztest("SinkProxyDScreenNotifyFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerconfigdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerconfigdistributedhardware_fuzzer/BUILD.gn
index 63f9245a..b9a36fc7 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerconfigdistributedhardware_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerconfigdistributedhardware_fuzzer/BUILD.gn
@@ -64,7 +64,7 @@ ohos_fuzztest("HandlerConfigDistributedHardwareFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerinitsource_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerinitsource_fuzzer/BUILD.gn
index 21827e4c..eefc55bf 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerinitsource_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerinitsource_fuzzer/BUILD.gn
@@ -64,7 +64,7 @@ ohos_fuzztest("HandlerInitSourceFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handleronremotesourcesvrdied_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handleronremotesourcesvrdied_fuzzer/BUILD.gn
index 33571707..3fb6293a 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handleronremotesourcesvrdied_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handleronremotesourcesvrdied_fuzzer/BUILD.gn
@@ -64,7 +64,7 @@ ohos_fuzztest("HandlerOnRemoteSourceSvrDiedFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/BUILD.gn
index 89012a0c..91633c3a 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/BUILD.gn
@@ -64,7 +64,7 @@ ohos_fuzztest("HandlerRegisterDistributedHardwareFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerunregisterdistributedhardware_fuzzer/BUILD.gn
index 097f023a..71f840bb 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerunregisterdistributedhardware_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerunregisterdistributedhardware_fuzzer/BUILD.gn
@@ -64,7 +64,7 @@ ohos_fuzztest("HandlerUnregisterDistributedHardwareFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyconfigdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyconfigdistributedhardware_fuzzer/BUILD.gn
index f5cc440a..723d3350 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyconfigdistributedhardware_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyconfigdistributedhardware_fuzzer/BUILD.gn
@@ -64,7 +64,7 @@ ohos_fuzztest("ProxyConfigDistributedHardwareFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxydscreennotify_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxydscreennotify_fuzzer/BUILD.gn
index 0fa4f3cd..e2a8662d 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxydscreennotify_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxydscreennotify_fuzzer/BUILD.gn
@@ -64,7 +64,7 @@ ohos_fuzztest("ProxyDScreenNotifyFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/BUILD.gn
index 48acfcca..07b61465 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/BUILD.gn
@@ -64,7 +64,7 @@ ohos_fuzztest("ProxyInitSourceFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/BUILD.gn
index e92e8047..57213789 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/BUILD.gn
@@ -64,7 +64,7 @@ ohos_fuzztest("ProxyRegisterDistributedHardwareFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyunregisterdistributedhardware_fuzzer/BUILD.gn
index ba6c4eb3..25ff5164 100644
--- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyunregisterdistributedhardware_fuzzer/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyunregisterdistributedhardware_fuzzer/BUILD.gn
@@ -64,7 +64,7 @@ ohos_fuzztest("ProxyUnregisterDistributedHardwareFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn
index 95b51fea..60e39f9f 100644
--- a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn
@@ -51,7 +51,7 @@ ohos_unittest("ScreenSinkTest") {
     "${fwk_utils_path}:distributedhardwareutils",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
     "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/screen_sink:distributed_screen_sink_sdk",
-    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
+    "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
   ]
@@ -63,7 +63,7 @@ ohos_unittest("ScreenSinkTest") {
     "ipc:ipc_core",
     "multimedia_player_framework:media_client",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn
index b2b7e63b..1af27df6 100644
--- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn
@@ -56,7 +56,7 @@ ohos_unittest("ScreenSourceTest") {
     "${fwk_utils_path}:distributedhardwareutils",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
     "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/screen_source:distributed_screen_source_sdk",
-    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
+    "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
   ]
@@ -68,7 +68,7 @@ ohos_unittest("ScreenSourceTest") {
     "ipc:ipc_core",
     "multimedia_player_framework:media_client",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn
index b554f158..0ed1a43a 100644
--- a/screenhandler/BUILD.gn
+++ b/screenhandler/BUILD.gn
@@ -35,8 +35,8 @@ ohos_shared_library("distributed_screen_handler") {
     "${common_path}:distributed_screen_utils",
     "${mediastandard_path}/interfaces/inner_api/native:media_client",
     "${windowmanager_path}/dm:libdm",
-    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
+    "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
   ]
 
   defines = [
diff --git a/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn
index eacb4392..46b21fef 100644
--- a/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn
+++ b/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn
@@ -53,8 +53,8 @@ ohos_fuzztest("PluginHardwareFuzzTest") {
     "${fwk_services_path}/distributedhardwarefwkservice:distributedhardwarefwksvr",
     "${mediastandard_path}/interfaces/inner_api/native:media_client",
     "${windowmanager_path}/dm:libdm",
-    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
+    "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
   ]
 
   defines = [
diff --git a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn
index aa6b5eed..41698b80 100644
--- a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn
+++ b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn
@@ -53,8 +53,8 @@ ohos_fuzztest("RegisterPluginListenerFuzzTest") {
     "${fwk_services_path}/distributedhardwarefwkservice:distributedhardwarefwksvr",
     "${mediastandard_path}/interfaces/inner_api/native:media_client",
     "${windowmanager_path}/dm:libdm",
-    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
+    "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
   ]
 
   defines = [
diff --git a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn
index ccf32885..9ea8e19e 100644
--- a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn
+++ b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn
@@ -53,8 +53,8 @@ ohos_fuzztest("UnPluginHardwareFuzzTest") {
     "${fwk_services_path}/distributedhardwarefwkservice:distributedhardwarefwksvr",
     "${mediastandard_path}/interfaces/inner_api/native:media_client",
     "${windowmanager_path}/dm:libdm",
-    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
+    "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
   ]
 
   defines = [
diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn
index 8c4c048a..af113427 100644
--- a/services/screenclient/BUILD.gn
+++ b/services/screenclient/BUILD.gn
@@ -39,8 +39,8 @@ ohos_shared_library("distributed_screen_client") {
     "${common_path}:distributed_screen_utils",
     "${graphicstandard_path}/frameworks/surface:surface",
     "${windowmanager_path}/wm:libwm",
-    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
+    "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
   ]
 
   defines = [
diff --git a/services/screendemo/BUILD.gn b/services/screendemo/BUILD.gn
index 2d7f2031..86acc100 100644
--- a/services/screendemo/BUILD.gn
+++ b/services/screendemo/BUILD.gn
@@ -45,8 +45,8 @@ ohos_executable("distributedScreenTest") {
     "${windowmanager_path}/wm:libwm",
     "//foundation/communication/dsoftbus/adapter:softbus_adapter",
     "//foundation/communication/dsoftbus/sdk:softbus_client",
-    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
+    "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
   ]
 
   defines = [
diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn
index 57e7f669..2f017051 100644
--- a/services/screenservice/sinkservice/BUILD.gn
+++ b/services/screenservice/sinkservice/BUILD.gn
@@ -75,7 +75,7 @@ ohos_shared_library("distributed_screen_sink") {
     "ipc:ipc_core",
     "multimedia_player_framework:media_client",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 
   subsystem_name = "distributedhardware"
diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn
index 9937c878..773779c8 100644
--- a/services/screenservice/sourceservice/BUILD.gn
+++ b/services/screenservice/sourceservice/BUILD.gn
@@ -79,7 +79,7 @@ ohos_shared_library("distributed_screen_source") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 
   subsystem_name = "distributedhardware"
-- 
Gitee