From 77da263848e12eb5cbaf3b550f15ae374506040a Mon Sep 17 00:00:00 2001 From: chen Date: Fri, 5 Aug 2022 18:28:17 +0800 Subject: [PATCH] add samgr Signed-off-by: chen Change-Id: Ic04b731c6b2beba110924b87ccd91ad046dc17db --- ability_runtime.gni | 2 +- bundle.json | 2 +- frameworks/js/napi/ability_manager/BUILD.gn | 2 +- frameworks/js/napi/app/appMgr/BUILD.gn | 2 +- frameworks/js/napi/app/app_manager/BUILD.gn | 2 +- frameworks/js/napi/mission_manager/BUILD.gn | 2 +- frameworks/js/napi/wantagent/BUILD.gn | 2 +- frameworks/native/ability/native/BUILD.gn | 4 ++-- frameworks/native/appkit/BUILD.gn | 8 ++++---- interfaces/inner_api/ability_manager/BUILD.gn | 2 +- interfaces/inner_api/app_manager/BUILD.gn | 2 +- interfaces/inner_api/connectionobs_manager/BUILD.gn | 2 +- interfaces/inner_api/dataobs_manager/BUILD.gn | 2 +- interfaces/inner_api/uri_permission/BUILD.gn | 2 +- interfaces/inner_api/wantagent/BUILD.gn | 2 +- services/abilitymgr/BUILD.gn | 2 +- services/appmgr/BUILD.gn | 2 +- services/dataobsmgr/BUILD.gn | 2 +- services/uripermmgr/BUILD.gn | 2 +- test/fuzztest/abilitymanager_fuzzer/BUILD.gn | 2 +- test/fuzztest/appmanager_fuzzer/BUILD.gn | 2 +- test/fuzztest/uripermissionmanager_fuzzer/BUILD.gn | 2 +- test/moduletest/common/ams/app_life_cycle_test/BUILD.gn | 2 +- test/unittest/ability_manager_service_anr_test/BUILD.gn | 4 ++-- test/unittest/ams_mgr_kill_process_test/BUILD.gn | 2 +- test/unittest/ams_mgr_proxy_test/BUILD.gn | 2 +- test/unittest/ams_mgr_scheduler_dump_test/BUILD.gn | 2 +- test/unittest/ams_mgr_stub_test/BUILD.gn | 2 +- test/unittest/app_mgr_service_dump_test/BUILD.gn | 2 +- test/unittest/app_mgr_service_inner_test/BUILD.gn | 2 +- test/unittest/completed_dispatcher_test/BUILD.gn | 2 +- test/unittest/pending_want_test/BUILD.gn | 2 +- test/unittest/trigger_Info_test/BUILD.gn | 2 +- test/unittest/want_agent_helper_test/BUILD.gn | 2 +- test/unittest/want_agent_info_test/BUILD.gn | 2 +- test/unittest/want_agent_test/BUILD.gn | 2 +- tools/aa/BUILD.gn | 2 +- tools/bundle.json | 2 +- tools/fm/BUILD.gn | 2 +- 39 files changed, 44 insertions(+), 44 deletions(-) diff --git a/ability_runtime.gni b/ability_runtime.gni index 193344edfd..811145eef4 100644 --- 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" diff --git a/bundle.json b/bundle.json index 111b69c3ca..85c871dd6c 100644 --- a/bundle.json +++ b/bundle.json @@ -59,7 +59,7 @@ "relational_store", "resource_management", "safwk", - "samgr_standard", + "samgr", "startup_l2", "utils_base", "window_manager" diff --git a/frameworks/js/napi/ability_manager/BUILD.gn b/frameworks/js/napi/ability_manager/BUILD.gn index d079f22426..57ce9785d7 100644 --- 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", ] diff --git a/frameworks/js/napi/app/appMgr/BUILD.gn b/frameworks/js/napi/app/appMgr/BUILD.gn index 9f09afd000..f7917af0a3 100644 --- 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) { diff --git a/frameworks/js/napi/app/app_manager/BUILD.gn b/frameworks/js/napi/app/app_manager/BUILD.gn index 424bdf174b..18dd2dfc43 100644 --- 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) { diff --git a/frameworks/js/napi/mission_manager/BUILD.gn b/frameworks/js/napi/mission_manager/BUILD.gn index 67fb2415d3..8aba3a7215 100644 --- 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", ] diff --git a/frameworks/js/napi/wantagent/BUILD.gn b/frameworks/js/napi/wantagent/BUILD.gn index 1cf6a5440a..d61f7eeff9 100644 --- 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", ] diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn index 6a8aa9e7f6..c61f2cc179 100644 --- 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", ] diff --git a/frameworks/native/appkit/BUILD.gn b/frameworks/native/appkit/BUILD.gn index f2dfbf60fc..9b99da7363 100644 --- 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", ] diff --git a/interfaces/inner_api/ability_manager/BUILD.gn b/interfaces/inner_api/ability_manager/BUILD.gn index bb544c5009..f01d840d6d 100644 --- 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", ] diff --git a/interfaces/inner_api/app_manager/BUILD.gn b/interfaces/inner_api/app_manager/BUILD.gn index c164d4f6fc..fbfb418306 100644 --- 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", ] diff --git a/interfaces/inner_api/connectionobs_manager/BUILD.gn b/interfaces/inner_api/connectionobs_manager/BUILD.gn index aa977f974a..69d33dde36 100644 --- 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", ] diff --git a/interfaces/inner_api/dataobs_manager/BUILD.gn b/interfaces/inner_api/dataobs_manager/BUILD.gn index 4162668a50..3cc9145526 100644 --- 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", ] diff --git a/interfaces/inner_api/uri_permission/BUILD.gn b/interfaces/inner_api/uri_permission/BUILD.gn index 34c5a9492f..8e3070a48b 100644 --- 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", ] diff --git a/interfaces/inner_api/wantagent/BUILD.gn b/interfaces/inner_api/wantagent/BUILD.gn index 2725a842fb..388f24eb1c 100644 --- 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", ] diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index accbd7dbac..d94571e1fa 100644 --- 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", ] diff --git a/services/appmgr/BUILD.gn b/services/appmgr/BUILD.gn index 50d7ead6c1..4241a9d57a 100644 --- 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", ] diff --git a/services/dataobsmgr/BUILD.gn b/services/dataobsmgr/BUILD.gn index 3c3f9f0916..f50d22a728 100644 --- 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", ] diff --git a/services/uripermmgr/BUILD.gn b/services/uripermmgr/BUILD.gn index 1de18339f2..3fa4045b67 100644 --- 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", ] diff --git a/test/fuzztest/abilitymanager_fuzzer/BUILD.gn b/test/fuzztest/abilitymanager_fuzzer/BUILD.gn index 9e9cf718a2..875059a49f 100644 --- 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", ] diff --git a/test/fuzztest/appmanager_fuzzer/BUILD.gn b/test/fuzztest/appmanager_fuzzer/BUILD.gn index db7f68ce29..551d635997 100644 --- 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", ] } diff --git a/test/fuzztest/uripermissionmanager_fuzzer/BUILD.gn b/test/fuzztest/uripermissionmanager_fuzzer/BUILD.gn index 8166129e1c..4e7eadd744 100644 --- 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", ] } diff --git a/test/moduletest/common/ams/app_life_cycle_test/BUILD.gn b/test/moduletest/common/ams/app_life_cycle_test/BUILD.gn index d9c1d974b1..a69796bc70 100644 --- 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) { diff --git a/test/unittest/ability_manager_service_anr_test/BUILD.gn b/test/unittest/ability_manager_service_anr_test/BUILD.gn index b53765e3e6..ae65455309 100644 --- 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", diff --git a/test/unittest/ams_mgr_kill_process_test/BUILD.gn b/test/unittest/ams_mgr_kill_process_test/BUILD.gn index 016ae9333a..7a0b1eba3b 100644 --- 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", ] } diff --git a/test/unittest/ams_mgr_proxy_test/BUILD.gn b/test/unittest/ams_mgr_proxy_test/BUILD.gn index 65421ac47a..b079f7de16 100644 --- 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", ] } diff --git a/test/unittest/ams_mgr_scheduler_dump_test/BUILD.gn b/test/unittest/ams_mgr_scheduler_dump_test/BUILD.gn index 439af46696..bea9196b95 100644 --- 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", ] } diff --git a/test/unittest/ams_mgr_stub_test/BUILD.gn b/test/unittest/ams_mgr_stub_test/BUILD.gn index 561b3d30f8..0e8aea39e0 100644 --- 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", ] } diff --git a/test/unittest/app_mgr_service_dump_test/BUILD.gn b/test/unittest/app_mgr_service_dump_test/BUILD.gn index 9b1d3a6d2c..056a1b4eac 100644 --- 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", ] } diff --git a/test/unittest/app_mgr_service_inner_test/BUILD.gn b/test/unittest/app_mgr_service_inner_test/BUILD.gn index 737283e0d7..365d513389 100644 --- 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", diff --git a/test/unittest/completed_dispatcher_test/BUILD.gn b/test/unittest/completed_dispatcher_test/BUILD.gn index 942db0818b..db1424d4e4 100644 --- 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", ] } diff --git a/test/unittest/pending_want_test/BUILD.gn b/test/unittest/pending_want_test/BUILD.gn index d885ecbd8b..bf922224d4 100644 --- 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", ] } diff --git a/test/unittest/trigger_Info_test/BUILD.gn b/test/unittest/trigger_Info_test/BUILD.gn index 6e12ab3fa1..777e7209af 100644 --- 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", ] } diff --git a/test/unittest/want_agent_helper_test/BUILD.gn b/test/unittest/want_agent_helper_test/BUILD.gn index 0823ab401f..2abe3fdcca 100644 --- 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", ] } diff --git a/test/unittest/want_agent_info_test/BUILD.gn b/test/unittest/want_agent_info_test/BUILD.gn index 28e6570831..033329bebb 100644 --- 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", ] } diff --git a/test/unittest/want_agent_test/BUILD.gn b/test/unittest/want_agent_test/BUILD.gn index 48482cab8e..2cef0e4f7a 100644 --- 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", ] } diff --git a/tools/aa/BUILD.gn b/tools/aa/BUILD.gn index a2b1e0c36e..6e3fa24ace 100644 --- 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", ] diff --git a/tools/bundle.json b/tools/bundle.json index 64c8895b78..549d0ae5e1 100644 --- 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": [] diff --git a/tools/fm/BUILD.gn b/tools/fm/BUILD.gn index 46c46af2fb..cb672873c5 100644 --- 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", ]