From aa9dfd8a56f52eb10d583a2ce9c04d6e4e51a560 Mon Sep 17 00:00:00 2001
From: chen <chenkang40@huawei.com>
Date: Thu, 21 Jul 2022 20:23:47 +0800
Subject: [PATCH] modify samgr partname Signed-off-by: chen
 <chenkang40@huawei.com> Change-Id: Iab10a0a47975bcc350e3ea8f3f19310e63d2d351

---
 bundle.json                 |  2 +-
 interfaces/kits/js/BUILD.gn |  2 +-
 services/BUILD.gn           |  2 +-
 services/test/BUILD.gn      | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bundle.json b/bundle.json
index d81b2591..ab54d4cc 100644
--- a/bundle.json
+++ b/bundle.json
@@ -28,7 +28,7 @@
                 "ipc",
                 "relational_store",
                 "safwk",
-                "samgr_standard"
+                "samgr"
             ]
         },
         "build": {
diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn
index 879d868f..ae085e35 100644
--- a/interfaces/kits/js/BUILD.gn
+++ b/interfaces/kits/js/BUILD.gn
@@ -55,6 +55,6 @@ ohos_shared_library("filemanager") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
diff --git a/services/BUILD.gn b/services/BUILD.gn
index 4a5c9c8e..5f84fd9c 100644
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -89,7 +89,7 @@ ohos_shared_library("fms_server") {
     "relational_store:native_dataability",
     "relational_store:native_rdb",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
diff --git a/services/test/BUILD.gn b/services/test/BUILD.gn
index 9ce71c0c..8d07b080 100644
--- a/services/test/BUILD.gn
+++ b/services/test/BUILD.gn
@@ -34,7 +34,7 @@ ohos_unittest("file_manager_proxy_test") {
 
   deps = [
     "$FMS_BASE_DIR:fms_server",
-    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
+    "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock_main",
     "//utils/native/base:utils",
   ]
@@ -43,7 +43,7 @@ ohos_unittest("file_manager_proxy_test") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
@@ -69,7 +69,7 @@ ohos_unittest("oper_factory_test") {
     "$FMS_BASE_DIR:fms_server",
     "//foundation/distributeddatamgr/appdatamgr/relational_store/interfaces/inner_api/appdatafwk:native_appdatafwk",
     "//foundation/distributeddatamgr/appdatamgr/relational_store/interfaces/inner_api/rdb:native_rdb",
-    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
+    "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//utils/native/base:utils",
   ]
 
@@ -77,7 +77,7 @@ ohos_unittest("oper_factory_test") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
@@ -102,7 +102,7 @@ ohos_unittest("file_manager_service_test") {
     "$FMS_BASE_DIR:fms_server",
     "//foundation/distributeddatamgr/appdatamgr/relational_store/interfaces/inner_api/appdatafwk:native_appdatafwk",
     "//foundation/distributeddatamgr/appdatamgr/relational_store/interfaces/inner_api/rdb:native_rdb",
-    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
+    "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//utils/native/base:utils",
   ]
 
@@ -110,7 +110,7 @@ ohos_unittest("file_manager_service_test") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 }
 
-- 
Gitee