modify samgr

Signed-off-by: Nhuangxiaolinabc123 <huangxiaolin12@huawei.com>
Change-Id: I42750146aec5a41a27d95fc849b5ccff62bff909

bundle.json

@@ -29,7 +29,7 @@
                 "config_policy",
                 "hilog_native",
                 "thirdparty_bounds_checking_function",
-                "samgr_standard",
+                "samgr",
                 "hiviewdfx_hilog_native",
                 "selinux",
                 "hiviewdfx",

device_info/BUILD.gn

@@ -33,7 +33,7 @@ if (!defined(ohos_lite)) {
     ]
 
     include_dirs = [
-      "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/",
+      "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include/",
       ".",
       "//base/startup/init/services/include/param",
       "//base/startup/init/interfaces/innerkits/include",

interfaces/innerkits/BUILD.gn

@@ -248,7 +248,7 @@ if (defined(ohos_lite)) {
       "c_utils:utils",
       "hilog_native:libhilog_base",
       "ipc:ipc_core",
-      "samgr_standard:samgr_proxy",
+      "samgr:samgr_proxy",
     ]
     public_configs = [ ":exported_header_files" ]
     part_name = "init"

services/param/watcher/BUILD.gn

@@ -27,7 +27,7 @@ ohos_shared_library("param_watcher") {
   ]
 
   include_dirs = [
-    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/",
+    "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include/",
     "//base/startup/init/services/param/include",
     "//base/startup/init/services/include/param",
     "//base/startup/init/services/param/linux",

test/exec_test/BUILD.gn

@@ -74,7 +74,7 @@ ohos_executable("ondemandTest") {
     "c_utils:utils",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 
   install_images = [ "system" ]

test/fuzztest/BUILD.gn

@@ -475,7 +475,7 @@ ohos_fuzztest("SystemWatchParameterFuzzTest") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 
   cflags = [

test/unittest/BUILD.gn

@@ -195,11 +195,11 @@ ohos_unittest("init_unittest") {
     "//base/startup/init/services/param/watcher/proxy",
     "//base/startup/init/test/unittest",
     "//base/startup/init/test/unittest/param",
-    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
-    "//foundation/distributedschedule/safwk/services/safwk/include",
-    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
-    "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include",
-    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
+    "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
+    "//foundation/systemabilitymgr/safwk/services/safwk/include",
+    "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
+    "//foundation/systemabilitymgr/samgr/adapter/interfaces/innerkits/include",
+    "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
     "//base/startup/init/ueventd/include",
     "//utils/system/safwk/native/include",
     "//third_party/bounds_checking_function/include",
@@ -251,7 +251,7 @@ ohos_unittest("init_unittest") {
     external_deps += [
       "ipc:ipc_core",
       "safwk:system_ability_fwk",
-      "samgr_standard:samgr_proxy",
+      "samgr:samgr_proxy",
     ]
   }