add samgr

Signed-off-by: chen <chenkang40@huawei.com> Change-Id: Ic04b731c6b2beba110924b87ccd91ad046dc17db
2025-01-21 22:35:14 +00:00 · 2022-08-05 18:28:17 +08:00 · 2022-08-05 18:28:17 +08:00 · 77da263848
commit 77da263848
parent ef525bc2fe
39 changed files with 44 additions and 44 deletions
--- a/ability_runtime.gni
+++ b/ability_runtime.gni
@ -31,7 +31,7 @@ multimodalinput_path = "//foundation/multimodalinput/input"
 windowmanager_path = "//foundation/window/window_manager"
 graphic_path = "//foundation/graphic/graphic_2d"
 global_path = "//base/global"
-distributedschedule_path = "//foundation/distributedschedule"
+distributedschedule_path = "//foundation/systemabilitymgr"
 notification_path = "//base/notification"
 ans_core_path =
    "${notification_path}/distributed_notification_service/frameworks/core"
--- a/bundle.json
+++ b/bundle.json
@ -59,7 +59,7 @@
            "relational_store",
            "resource_management",
            "safwk",
-            "samgr_standard",
+            "samgr",
            "startup_l2",
            "utils_base",
            "window_manager"
--- a/frameworks/js/napi/ability_manager/BUILD.gn
+++ b/frameworks/js/napi/ability_manager/BUILD.gn
@ -48,7 +48,7 @@ ohos_shared_library("abilitymanager_napi") {
    "ipc_js:rpc",
    "napi:ace_napi",
    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

--- a/frameworks/js/napi/app/appMgr/BUILD.gn
+++ b/frameworks/js/napi/app/appMgr/BUILD.gn
@ -41,7 +41,7 @@ ohos_shared_library("napi_app_mgr") {
    "ipc:ipc_core",
    "napi:ace_napi",
    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]
  if (ability_runtime_graphics) {
--- a/frameworks/js/napi/app/app_manager/BUILD.gn
+++ b/frameworks/js/napi/app/app_manager/BUILD.gn
@ -47,7 +47,7 @@ ohos_shared_library("appmanager_napi") {
    "ipc:ipc_core",
    "napi:ace_napi",
    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]
  if (ability_runtime_graphics) {
--- a/frameworks/js/napi/mission_manager/BUILD.gn
+++ b/frameworks/js/napi/mission_manager/BUILD.gn
@ -43,7 +43,7 @@ ohos_shared_library("missionmanager_napi") {
    "ipc:ipc_core",
    "ipc_js:rpc",
    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

--- a/frameworks/js/napi/wantagent/BUILD.gn
+++ b/frameworks/js/napi/wantagent/BUILD.gn
@ -46,7 +46,7 @@ ohos_shared_library("wantagent") {
    "ipc:ipc_core",
    "napi:ace_napi",
    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

--- a/frameworks/native/ability/native/BUILD.gn
+++ b/frameworks/native/ability/native/BUILD.gn
@ -99,7 +99,7 @@ ohos_shared_library("static_subscriber_ipc") {
    "ability_base:want",
    "common_event_service:cesfwk_innerkits",
    "ipc:ipc_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

@ -226,7 +226,7 @@ ohos_shared_library("abilitykit_native") {
    "relational_store:native_dataability",
    "relational_store:native_rdb",
    "relational_store:rdb_data_share_adapter",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

--- a/frameworks/native/appkit/BUILD.gn
+++ b/frameworks/native/appkit/BUILD.gn
@ -134,7 +134,7 @@ ohos_shared_library("appkit_native") {
    "init:libbegetutil",
    "ipc:ipc_core",
    "napi:ace_napi",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

@ -192,7 +192,7 @@ ohos_shared_library("app_context") {
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
    "napi:ace_napi",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

@ -252,7 +252,7 @@ ohos_shared_library("app_context_utils") {
    "ipc:ipc_core",
    "napi:ace_napi",
    "resource_management:resmgr_napi_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

@ -318,7 +318,7 @@ ohos_shared_library("appkit_delegator") {
    "hitrace_native:hitrace_meter",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

--- a/interfaces/inner_api/ability_manager/BUILD.gn
+++ b/interfaces/inner_api/ability_manager/BUILD.gn
@ -110,7 +110,7 @@ ohos_shared_library("ability_manager") {
    "ipc:ipc_core",
    "relational_store:native_dataability",
    "relational_store:native_rdb",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

--- a/interfaces/inner_api/app_manager/BUILD.gn
+++ b/interfaces/inner_api/app_manager/BUILD.gn
@ -101,7 +101,7 @@ ohos_shared_library("app_manager") {
    "hitrace_native:hitrace_meter",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

--- a/interfaces/inner_api/connectionobs_manager/BUILD.gn
+++ b/interfaces/inner_api/connectionobs_manager/BUILD.gn
@ -48,7 +48,7 @@ ohos_shared_library("connection_obs_manager") {
    "bundle_framework:appexecfwk_base",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

--- a/interfaces/inner_api/dataobs_manager/BUILD.gn
+++ b/interfaces/inner_api/dataobs_manager/BUILD.gn
@ -48,7 +48,7 @@ ohos_shared_library("dataobs_manager") {
    "eventhandler:libeventhandler",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

--- a/interfaces/inner_api/uri_permission/BUILD.gn
+++ b/interfaces/inner_api/uri_permission/BUILD.gn
@ -43,7 +43,7 @@ ohos_shared_library("uri_permission_mgr") {
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

--- a/interfaces/inner_api/wantagent/BUILD.gn
+++ b/interfaces/inner_api/wantagent/BUILD.gn
@ -72,7 +72,7 @@ ohos_shared_library("wantagent_innerkits") {
    "eventhandler:libeventhandler",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

--- a/services/abilitymgr/BUILD.gn
+++ b/services/abilitymgr/BUILD.gn
@ -134,7 +134,7 @@ ohos_shared_library("abilityms") {
    "relational_store:native_dataability",
    "relational_store:native_rdb",
    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

--- a/services/appmgr/BUILD.gn
+++ b/services/appmgr/BUILD.gn
@ -84,7 +84,7 @@ ohos_shared_library("libappms") {
    "init:libbegetutil",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "startup_l2:syspara_watchagent",
    "utils_base:utils",
  ]
--- a/services/dataobsmgr/BUILD.gn
+++ b/services/dataobsmgr/BUILD.gn
@ -48,7 +48,7 @@ ohos_shared_library("dataobsms") {
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

--- a/services/uripermmgr/BUILD.gn
+++ b/services/uripermmgr/BUILD.gn
@ -46,7 +46,7 @@ ohos_shared_library("libupms") {
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

--- a/test/fuzztest/abilitymanager_fuzzer/BUILD.gn
+++ b/test/fuzztest/abilitymanager_fuzzer/BUILD.gn
@ -49,7 +49,7 @@ ohos_fuzztest("AbilityManagerFuzzTest") {
    "common_event_service:cesfwk_innerkits",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

--- a/test/fuzztest/appmanager_fuzzer/BUILD.gn
+++ b/test/fuzztest/appmanager_fuzzer/BUILD.gn
@ -52,7 +52,7 @@ ohos_fuzztest("AppManagerFuzzTest") {
    "eventhandler:libeventhandler",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
  ]
 }

--- a/test/fuzztest/uripermissionmanager_fuzzer/BUILD.gn
+++ b/test/fuzztest/uripermissionmanager_fuzzer/BUILD.gn
@ -49,7 +49,7 @@ ohos_fuzztest("UriPermissionManagerFuzzTest") {
    "bundle_framework:appexecfwk_core",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]
 }
--- a/test/moduletest/common/ams/app_life_cycle_test/BUILD.gn
+++ b/test/moduletest/common/ams/app_life_cycle_test/BUILD.gn
@ -35,7 +35,7 @@ ohos_moduletest("AmsAppLifeCycleModuleTest") {
    "bundle_framework:appexecfwk_base",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
  ]

  if (background_task_mgr_continuous_task_enable) {
--- a/test/unittest/ability_manager_service_anr_test/BUILD.gn
+++ b/test/unittest/ability_manager_service_anr_test/BUILD.gn
@ -22,8 +22,8 @@ ohos_unittest("ability_manager_service_anr_test") {
  include_dirs = [
    "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/system_ability_mock",
    "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/arkui_mock",
-    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
-    "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/",
+    "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
+    "//foundation/systemabilitymgr/samgr/adapter/interfaces/innerkits/include/",
    "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
    "${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include",
    "//base/notification/common_event_service/frameworks/core/include",
--- a/test/unittest/ams_mgr_kill_process_test/BUILD.gn
+++ b/test/unittest/ams_mgr_kill_process_test/BUILD.gn
@ -54,7 +54,7 @@ ohos_unittest("AmsMgrKillProcessTest") {
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]
 }
--- a/test/unittest/ams_mgr_proxy_test/BUILD.gn
+++ b/test/unittest/ams_mgr_proxy_test/BUILD.gn
@ -43,7 +43,7 @@ ohos_unittest("AmsMgrProxyTest") {
    "eventhandler:libeventhandler",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
  ]
 }

--- a/test/unittest/ams_mgr_scheduler_dump_test/BUILD.gn
+++ b/test/unittest/ams_mgr_scheduler_dump_test/BUILD.gn
@ -39,7 +39,7 @@ ohos_unittest("ams_mgr_scheduler_dump_test") {
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]
 }
--- a/test/unittest/ams_mgr_stub_test/BUILD.gn
+++ b/test/unittest/ams_mgr_stub_test/BUILD.gn
@ -41,7 +41,7 @@ ohos_unittest("AmsMgrStubTest") {
    "eventhandler:libeventhandler",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
  ]
 }

--- a/test/unittest/app_mgr_service_dump_test/BUILD.gn
+++ b/test/unittest/app_mgr_service_dump_test/BUILD.gn
@ -37,7 +37,7 @@ ohos_unittest("app_mgr_service_dump_test") {
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]
 }
--- a/test/unittest/app_mgr_service_inner_test/BUILD.gn
+++ b/test/unittest/app_mgr_service_inner_test/BUILD.gn
@ -38,7 +38,7 @@ ohos_unittest("AppMgrServiceInnerTest") {
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "startup_l2:syspara",
    "startup_l2:syspara_watchagent",
    "utils_base:utils",
--- a/test/unittest/completed_dispatcher_test/BUILD.gn
+++ b/test/unittest/completed_dispatcher_test/BUILD.gn
@ -49,7 +49,7 @@ ohos_unittest("completed_dispatcher_test") {
    "eventhandler:libeventhandler",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
  ]
 }

--- a/test/unittest/pending_want_test/BUILD.gn
+++ b/test/unittest/pending_want_test/BUILD.gn
@ -54,7 +54,7 @@ ohos_unittest("pending_want_test") {
    "eventhandler:libeventhandler",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
  ]
 }

--- a/test/unittest/trigger_Info_test/BUILD.gn
+++ b/test/unittest/trigger_Info_test/BUILD.gn
@ -49,7 +49,7 @@ ohos_unittest("trigger_Info_test") {
    "eventhandler:libeventhandler",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
  ]
 }

--- a/test/unittest/want_agent_helper_test/BUILD.gn
+++ b/test/unittest/want_agent_helper_test/BUILD.gn
@ -54,7 +54,7 @@ ohos_unittest("want_agent_helper_test") {
    "eventhandler:libeventhandler",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
  ]
 }

--- a/test/unittest/want_agent_info_test/BUILD.gn
+++ b/test/unittest/want_agent_info_test/BUILD.gn
@ -49,7 +49,7 @@ ohos_unittest("want_agent_info_test") {
    "eventhandler:libeventhandler",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
  ]
 }

--- a/test/unittest/want_agent_test/BUILD.gn
+++ b/test/unittest/want_agent_test/BUILD.gn
@ -49,7 +49,7 @@ ohos_unittest("want_agent_test") {
    "eventhandler:libeventhandler",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
  ]
 }

--- a/tools/aa/BUILD.gn
+++ b/tools/aa/BUILD.gn
@ -63,7 +63,7 @@ ohos_source_set("tools_aa_source_set") {
    "eventhandler:libeventhandler",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]

--- a/tools/bundle.json
+++ b/tools/bundle.json
@ -24,7 +24,7 @@
                "ability_runtime",
                "hiviewdfx_hilog_native",
                "ipc",
-                "samgr_standard",
+                "samgr",
                "utils_base"
            ],
            "third_party": []
--- a/tools/fm/BUILD.gn
+++ b/tools/fm/BUILD.gn
@ -51,7 +51,7 @@ ohos_source_set("tools_fm_source_set") {
    "form_fwk:form_manager",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
    "utils_base:utils",
  ]