From 2139042f0c10921a3d3ff6efc95763341920d8f7 Mon Sep 17 00:00:00 2001 From: chen Date: Fri, 22 Jul 2022 10:24:59 +0800 Subject: [PATCH] modify samgr partname Signed-off-by: chen Change-Id: I362cd5ec63e69ceec6ffae7f44f372094e81535a --- bundle.json | 2 +- frameworks/ans/BUILD.gn | 2 +- frameworks/ans/test/unittest/BUILD.gn | 2 +- frameworks/core/BUILD.gn | 2 +- frameworks/test/moduletest/BUILD.gn | 8 ++++---- notification.gni | 2 +- services/ans/test/unittest/BUILD.gn | 2 +- services/test/moduletest/BUILD.gn | 2 +- test/common/acts/BUILD.gn | 2 +- test/common/acts/actsnotificationfuzztest/BUILD.gn | 2 +- test/systemtest/acts/ansDump/BUILD.gn | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bundle.json b/bundle.json index b3f0a9292..6640bb1c3 100644 --- a/bundle.json +++ b/bundle.json @@ -54,7 +54,7 @@ "deps": { "components": [ "ability_base", - "samgr_standard", + "samgr", "ipc", "ability_runtime", "dmsfwk", diff --git a/frameworks/ans/BUILD.gn b/frameworks/ans/BUILD.gn index 19a46aee3..d9be5376a 100644 --- a/frameworks/ans/BUILD.gn +++ b/frameworks/ans/BUILD.gn @@ -92,7 +92,7 @@ ohos_shared_library("ans_innerkits") { "ipc:ipc_core", "multimedia_image_standard:image_native", "relational_store:native_rdb", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] if (is_double_framework) { diff --git a/frameworks/ans/test/unittest/BUILD.gn b/frameworks/ans/test/unittest/BUILD.gn index 8d52837aa..d5865b165 100644 --- a/frameworks/ans/test/unittest/BUILD.gn +++ b/frameworks/ans/test/unittest/BUILD.gn @@ -67,7 +67,7 @@ ohos_unittest("ans_reminder_unit_test") { "multimedia_image_standard:image_native", "relational_store:native_rdb", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] subsystem_name = "${subsystem_name}" diff --git a/frameworks/core/BUILD.gn b/frameworks/core/BUILD.gn index ea5bb5a5d..b5f6d67af 100644 --- a/frameworks/core/BUILD.gn +++ b/frameworks/core/BUILD.gn @@ -96,7 +96,7 @@ ohos_shared_library("ans_core") { "multimedia_image_standard:image_native", "os_account:os_account_innerkits", "relational_store:native_rdb", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "time_native:time_service", ] diff --git a/frameworks/test/moduletest/BUILD.gn b/frameworks/test/moduletest/BUILD.gn index e5c39c97b..b98272294 100644 --- a/frameworks/test/moduletest/BUILD.gn +++ b/frameworks/test/moduletest/BUILD.gn @@ -92,7 +92,7 @@ ohos_moduletest("ans_fw_module_test") { "multimedia_image_standard:image_native", "relational_store:native_rdb", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] subsystem_name = "${subsystem_name}" @@ -167,7 +167,7 @@ ohos_moduletest("ans_innerkits_module_publish_test") { "multimedia_image_standard:image_native", "relational_store:native_rdb", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] subsystem_name = "${subsystem_name}" @@ -240,7 +240,7 @@ ohos_moduletest("ans_innerkits_module_slot_test") { "multimedia_image_standard:image_native", "relational_store:native_rdb", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] subsystem_name = "${subsystem_name}" @@ -312,7 +312,7 @@ ohos_moduletest("ans_innerkits_module_setting_test") { "multimedia_image_standard:image_native", "relational_store:native_rdb", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] subsystem_name = "${subsystem_name}" diff --git a/notification.gni b/notification.gni index a3dfa16e2..23ca14d78 100644 --- a/notification.gni +++ b/notification.gni @@ -39,7 +39,7 @@ component_external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] declare_args() { diff --git a/services/ans/test/unittest/BUILD.gn b/services/ans/test/unittest/BUILD.gn index f819ff520..b24fcbda7 100644 --- a/services/ans/test/unittest/BUILD.gn +++ b/services/ans/test/unittest/BUILD.gn @@ -97,7 +97,7 @@ ohos_unittest("ans_unit_test") { "multimedia_player_framework:media_client", "os_account:os_account_innerkits", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "time_native:time_service", ] diff --git a/services/test/moduletest/BUILD.gn b/services/test/moduletest/BUILD.gn index c3f8e9130..6305fef76 100644 --- a/services/test/moduletest/BUILD.gn +++ b/services/test/moduletest/BUILD.gn @@ -83,7 +83,7 @@ ohos_moduletest("ans_module_test") { "multimedia_player_framework:media_client", "os_account:os_account_innerkits", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", "time_native:time_service", ] diff --git a/test/common/acts/BUILD.gn b/test/common/acts/BUILD.gn index d8b4ffc88..6ae9083f4 100644 --- a/test/common/acts/BUILD.gn +++ b/test/common/acts/BUILD.gn @@ -20,7 +20,7 @@ config("ansfwk_kits_test_config") { "//utils/native/base/include", "//utils/system/safwk/native/include", "${services_path}/include", - "//foundation/distributedschedule/safwk/services/safwk/include", + "//foundation/systemabilitymgr/safwk/services/safwk/include", ] } diff --git a/test/common/acts/actsnotificationfuzztest/BUILD.gn b/test/common/acts/actsnotificationfuzztest/BUILD.gn index 2026181f2..388c6aeff 100644 --- a/test/common/acts/actsnotificationfuzztest/BUILD.gn +++ b/test/common/acts/actsnotificationfuzztest/BUILD.gn @@ -79,7 +79,7 @@ ohos_systemtest("ActsNotificationFuzzTest") { "relational_store:native_appdatafwk", "relational_store:native_dataability", "relational_store:native_rdb", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/test/systemtest/acts/ansDump/BUILD.gn b/test/systemtest/acts/ansDump/BUILD.gn index 417356181..70cadf5a4 100644 --- a/test/systemtest/acts/ansDump/BUILD.gn +++ b/test/systemtest/acts/ansDump/BUILD.gn @@ -44,7 +44,7 @@ ohos_systemtest("AnsDumpTest") { "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } -- Gitee