From 9282028e7f1919e9912c251a1e25c49c30d98ee7 Mon Sep 17 00:00:00 2001
From: huangxiaolinabc123 <huangxiaolin12@huawei.com>
Date: Sat, 30 Jul 2022 21:02:31 +0800
Subject: [PATCH] add samgr

Signed-off-by: huangxiaolinabc123 <huangxiaolin12@huawei.com>
Change-Id: I3f5e8e667506991134a2374e39a74a247bc05ffc
---
 bundle.json                                                   | 2 +-
 interfaces/inner_kits/BUILD.gn                                | 4 ++--
 services/distributedhardwarefwkservice/BUILD.gn               | 4 ++--
 .../test/fuzztest/accessmanager_fuzzer/BUILD.gn               | 4 ++--
 .../test/unittest/common/accessmanager/BUILD.gn               | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bundle.json b/bundle.json
index 6e7de739..dbee9e04 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/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn
index c33d5da2..ef2930cd 100644
--- a/interfaces/inner_kits/BUILD.gn
+++ b/interfaces/inner_kits/BUILD.gn
@@ -39,7 +39,7 @@ ohos_shared_library("libdhfwk_sdk") {
   deps = [
     "${services_path}/distributedhardwarefwkservice:distributedhardwarefwksvr",
     "${utils_path}:distributedhardwareutils",
-    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
+    "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//utils/native/base:utils",
   ]
 
@@ -53,7 +53,7 @@ ohos_shared_library("libdhfwk_sdk") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 
   cflags_cc = [ "-DHILOG_ENABLE" ]
diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn
index 41bfac5b..9e2038f6 100644
--- a/services/distributedhardwarefwkservice/BUILD.gn
+++ b/services/distributedhardwarefwkservice/BUILD.gn
@@ -83,7 +83,7 @@ ohos_shared_library("distributedhardwarefwksvr") {
     "//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager:ability_manager",
     "//foundation/ability/ability_runtime/services/abilitymgr:abilityms",
     "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
-    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
+    "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk",
   ]
 
   defines = [
@@ -104,7 +104,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 3276f8e1..1190743c 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 4d4217ac..782c6628 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",
   ]
 }
 
-- 
Gitee