diff --git a/bundle.json b/bundle.json index 7cf5e4ade89892608ade60eb3f941ee60986514a..a78336c9de74ccb36fcaa183d49b4fb0a411df7d 100644 --- a/bundle.json +++ b/bundle.json @@ -36,7 +36,7 @@ "hiviewdfx_hilog_native", "startup_l2", "bundle_framework", - "samgr_standard", + "samgr", "ipc", "safwk", "common", diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index 442f7a08ee004d6b14b2cf3d39e0b4bcbaa9a217..1b2032357768986ac62f9e959ee24ac45f2f71da 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -63,7 +63,7 @@ ohos_shared_library("distributedhardwarefwksvr") { "init:libbegetutil", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] subsystem_name = "distributedhardware" diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn index 73d776c3eab77d6ef75e3cc6464a48999b6bca7e..69628d647970db4b8c71d4e08835e3557869eabb 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn @@ -46,7 +46,7 @@ ohos_fuzztest("AccessmanagerFuzzTest") { "${utils_path}:distributedhardwareutils", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", + "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] defines = [ @@ -62,7 +62,7 @@ ohos_fuzztest("AccessmanagerFuzzTest") { "init:libbegetutil", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index 0720b0e01f84918f1acc21fb26bd0314e8bed8c0..186f149c4d1db71b21baea13450e183a60e6e42d 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -48,7 +48,7 @@ ohos_unittest("AccessManagerTest") { "${utils_path}:distributedhardwareutils", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", + "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//third_party/googletest:gtest_main", ] defines = [ @@ -65,7 +65,7 @@ ohos_unittest("AccessManagerTest") { "init:libbegetutil", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] } diff --git a/services/distributedhardwarefwkserviceimpl/BUILD.gn b/services/distributedhardwarefwkserviceimpl/BUILD.gn index 83328024ead464c63820022252b8344039436970..d6e378e1a15d54fccbba4950f9d6bd02a3d76e8b 100644 --- a/services/distributedhardwarefwkserviceimpl/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/BUILD.gn @@ -69,7 +69,7 @@ ohos_shared_library("distributedhardwarefwksvr_impl") { "${utils_path}:distributedhardwareutils", "//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager:ability_manager", "//foundation/ability/ability_runtime/services/abilitymgr:abilityms", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", + "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] @@ -90,7 +90,7 @@ ohos_shared_library("distributedhardwarefwksvr_impl") { "init:libbegetutil", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] subsystem_name = "distributedhardware"