diff --git a/bundle.json b/bundle.json index 6e7de739f64daf91f1ac819da651c68076de192a..dbee9e04950e7bfa1bdc852f6d18103915f9cd5a 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/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn index c33d5da2c880c43ca79ca0fafeffc7f970cdc5de..ef2930cd184ef9696c3404f35b9a5a4fc76c7a5d 100644 --- a/interfaces/inner_kits/BUILD.gn +++ b/interfaces/inner_kits/BUILD.gn @@ -39,7 +39,7 @@ ohos_shared_library("libdhfwk_sdk") { deps = [ "${services_path}/distributedhardwarefwkservice:distributedhardwarefwksvr", "${utils_path}:distributedhardwareutils", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", ] @@ -53,7 +53,7 @@ ohos_shared_library("libdhfwk_sdk") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index 41bfac5b6edf2db5ce132d3f7fcb29257eb77ee8..9e2038f67d0bd8b75076c05b9e645378ab138c03 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -83,7 +83,7 @@ ohos_shared_library("distributedhardwarefwksvr") { "//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager:ability_manager", "//foundation/ability/ability_runtime/services/abilitymgr:abilityms", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", + "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] defines = [ @@ -104,7 +104,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 3276f8e1ae9d606d85e484377cb02c5898fed1bc..1190743c1dd35e28c5e8df380533b59da77593db 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 4d4217acffabb8581649752c79ff8c1ebcb63bf2..782c66280e4cf523587a30dd820353edd6ade4ab 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", ] }