From 930acdbfc94537b797db83311200f6ca9cc293e0 Mon Sep 17 00:00:00 2001
From: chen <chenkang40@huawei.com>
Date: Thu, 21 Jul 2022 19:37:50 +0800
Subject: [PATCH] modify samgr partname Signed-off-by: chen
 <chenkang40@huawei.com> Change-Id: I1770a90d99cdf2d9b4912088c1dbb071a6d6f6e1

---
 bundle.json                                                   | 2 +-
 services/distributedhardwarefwkservice/BUILD.gn               | 2 +-
 .../test/fuzztest/accessmanager_fuzzer/BUILD.gn               | 4 ++--
 .../test/unittest/common/accessmanager/BUILD.gn               | 4 ++--
 services/distributedhardwarefwkserviceimpl/BUILD.gn           | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bundle.json b/bundle.json
index 7cf5e4ad..a78336c9 100644
--- a/bundle.json
+++ b/bundle.json
@@ -36,7 +36,7 @@
         "hiviewdfx_hilog_native",
         "startup_l2",
         "bundle_framework",
-        "samgr_standard",
+        "samgr",
         "ipc",
         "safwk",
         "common",
diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn
index 442f7a08..1b203235 100644
--- a/services/distributedhardwarefwkservice/BUILD.gn
+++ b/services/distributedhardwarefwkservice/BUILD.gn
@@ -63,7 +63,7 @@ ohos_shared_library("distributedhardwarefwksvr") {
     "init:libbegetutil",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 
   subsystem_name = "distributedhardware"
diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn
index 73d776c3..69628d64 100644
--- a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn
@@ -46,7 +46,7 @@ ohos_fuzztest("AccessmanagerFuzzTest") {
     "${utils_path}:distributedhardwareutils",
     "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
     "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
-    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
+    "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk",
   ]
 
   defines = [
@@ -62,7 +62,7 @@ ohos_fuzztest("AccessmanagerFuzzTest") {
     "init:libbegetutil",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn
index 0720b0e0..186f149c 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn
@@ -48,7 +48,7 @@ ohos_unittest("AccessManagerTest") {
     "${utils_path}:distributedhardwareutils",
     "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
     "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
-    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
+    "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk",
     "//third_party/googletest:gtest_main",
   ]
   defines = [
@@ -65,7 +65,7 @@ ohos_unittest("AccessManagerTest") {
     "init:libbegetutil",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/services/distributedhardwarefwkserviceimpl/BUILD.gn b/services/distributedhardwarefwkserviceimpl/BUILD.gn
index 83328024..d6e378e1 100644
--- a/services/distributedhardwarefwkserviceimpl/BUILD.gn
+++ b/services/distributedhardwarefwkserviceimpl/BUILD.gn
@@ -69,7 +69,7 @@ ohos_shared_library("distributedhardwarefwksvr_impl") {
     "${utils_path}:distributedhardwareutils",
     "//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager:ability_manager",
     "//foundation/ability/ability_runtime/services/abilitymgr:abilityms",
-    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
+    "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk",
     "//utils/native/base:utils",
   ]
 
@@ -90,7 +90,7 @@ ohos_shared_library("distributedhardwarefwksvr_impl") {
     "init:libbegetutil",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 
   subsystem_name = "distributedhardware"
-- 
Gitee