diff --git a/bundle.json b/bundle.json index 1369d3a0da04f5b378928e8c5c1db6640dc881e4..687a5e2d9b785b5a0b91a94a7c122c1ca93c5fcf 100644 --- a/bundle.json +++ b/bundle.json @@ -55,7 +55,7 @@ "components": [ "distributeddatamgr", "ace_engine", - "samgr_standard", + "samgr", "hitrace_native", "napi", "window_manager", diff --git a/frameworks/ans/BUILD.gn b/frameworks/ans/BUILD.gn index 04bae7ef29d652b6d1c2aa0eae8aa38e0aed3a68..3e07cf3f54260c526df47a6cdd209ed53c5b440e 100644 --- a/frameworks/ans/BUILD.gn +++ b/frameworks/ans/BUILD.gn @@ -90,7 +90,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 5520e93510f6180f2d9c6a979009fec699bc6cb3..d6a23b8ef991c71cb516f1142846a9fcee9ade70 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 c0e116f07e3f995abf94d58ceb73e2a97f612fef..184dadf0c757b24b719944929bbf8afaab74bb1b 100644 --- a/frameworks/core/BUILD.gn +++ b/frameworks/core/BUILD.gn @@ -95,7 +95,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_service:time_service", ] diff --git a/frameworks/test/moduletest/BUILD.gn b/frameworks/test/moduletest/BUILD.gn index 4a802beb389538c43dacfb57f518735206b772cd..56a133178e5863f0d843f203e3d880915cdd3fd3 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 a3dfa16e2bd146cd996f77118e955d37a17e8a37..23ca14d7834a514d1f3d165a821a7162c8d50975 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 f79fbcb4e7616074dfee9531b51b043a9bea9492..1292f8e085fd9c5767c1d208c3ea3bcc3ed231d9 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_service:time_service", ] diff --git a/services/test/moduletest/BUILD.gn b/services/test/moduletest/BUILD.gn index e3a7f31a6b9881d29e3a8b7a20c4ca57e9e02b4b..116a2dd1004735bd9d9a5789b086ec3f9e42554a 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_service:time_service", ] diff --git a/test/common/acts/BUILD.gn b/test/common/acts/BUILD.gn index e38062f940144b8188de904a6d3387363dfe58ef..62fcbd8d55018988f527566c092f3a22238b65be 100644 --- a/test/common/acts/BUILD.gn +++ b/test/common/acts/BUILD.gn @@ -20,7 +20,7 @@ config("ansfwk_kits_test_config") { "//commonlibrary/c_utils/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 3539bde9bb7e3e916e2809e14f262f23370f6384..af7b7311e7fa7072582817567d72a4af8665e897 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 64415c50e36b5369b0c49a31731ba7d5111f99a9..85bb7a9b326729fbd9c5e392a83003fc2848d5f3 100644 --- a/test/systemtest/acts/ansDump/BUILD.gn +++ b/test/systemtest/acts/ansDump/BUILD.gn @@ -44,7 +44,7 @@ ohos_systemtest("AnsDumpTest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] }