diff --git a/devicemanager.gni b/devicemanager.gni index 18cce5ad64fd34c53e51918c87ee1552609940c4..8f9b459c9a9f087582501c76004302e044615558 100644 --- a/devicemanager.gni +++ b/devicemanager.gni @@ -19,7 +19,8 @@ utils_path = "${devicemanager_path}/utils" services_path = "${devicemanager_path}/services/devicemanagerservice" innerkits_path = "${devicemanager_path}/interfaces/inner_kits" ext_path = "${devicemanager_path}/ext" - +aaservices_path = "//foundation/aafwk/standard/services" +aainnerkits_path = "//foundation/aafwk/standard/interfaces/innerkits" #--------------------------softbus----------------------------------# #---------------------------hichan----------------------------------# diff --git a/ext/no_interaction_auth/BUILD.gn b/ext/no_interaction_auth/BUILD.gn index 9aad3eaed02f525709a3497015afcce25cbb75dc..5c77391772724226f0d7caf4d4a65d11fdc9edaf 100644 --- a/ext/no_interaction_auth/BUILD.gn +++ b/ext/no_interaction_auth/BUILD.gn @@ -68,9 +68,9 @@ if (defined(ohos_lite)) { "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", "//base/security/deviceauth/services:deviceauth_sdk", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice", "//utils/native/base:utils", ] diff --git a/ext/pin_auth/BUILD.gn b/ext/pin_auth/BUILD.gn index 477009980d49f475fdff518f620bf67a32795a25..01e0c8b5908c5ef2f0a0eb139d2345afaa62afe6 100644 --- a/ext/pin_auth/BUILD.gn +++ b/ext/pin_auth/BUILD.gn @@ -139,9 +139,9 @@ if (defined(ohos_lite)) { "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", "//base/security/deviceauth/services:deviceauth_sdk", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", "//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr", "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice", "//foundation/windowmanager/wm:libwm", diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn index 9713108013f1ff4398328a5abc618b20fd951006..97962edb3f2307be8fe9e354e29e115c1b159b90 100755 --- a/services/devicemanagerservice/BUILD.gn +++ b/services/devicemanagerservice/BUILD.gn @@ -302,9 +302,9 @@ if (defined(ohos_lite)) { "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", "//base/security/deviceauth/services:deviceauth_sdk", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", ] if (os_account_part_exists) { diff --git a/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn b/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn index 638f73046861bbeea692b13259dd3f90fef652d1..2c0a08fd310a0a47121e7f24f01ab97f46e388eb 100644 --- a/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn @@ -93,9 +93,9 @@ ohos_fuzztest("IpcClientManagerFuzzTest") { "${utils_path}:devicemanagerutils", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//base/security/deviceauth/services:deviceauth_sdk", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice", ] diff --git a/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn b/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn index 5cf5188fde55d7eb8ed7d38ed03694b38f72fa7d..1a8de4e6fbf2d79078ea4fb74ffb4ccaac2ecb99 100644 --- a/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn +++ b/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn @@ -94,9 +94,9 @@ ohos_fuzztest("IpcCmdRegisterFuzzTest") { "${utils_path}:devicemanagerutils", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//base/security/deviceauth/services:deviceauth_sdk", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice", ] diff --git a/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn b/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn index 4ba1a3b684276cc8e583bf9b291e7cf2f4d83e49..2651a720a9b146637345d1063d7b0c8861127ac5 100644 --- a/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn @@ -93,9 +93,9 @@ ohos_fuzztest("IpcServerClientProxyFuzzTest") { "${utils_path}:devicemanagerutils", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//base/security/deviceauth/services:deviceauth_sdk", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice", ] diff --git a/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn b/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn index cb04a36f9442fe69409f36edd5d65d3b616174f7..c2c6aa17c1c3cc7afdd8fc9551f30275d551dfdf 100644 --- a/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn @@ -93,9 +93,9 @@ ohos_fuzztest("IpcServerListenerFuzzTest") { "${utils_path}:devicemanagerutils", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//base/security/deviceauth/services:deviceauth_sdk", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice", ] diff --git a/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn b/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn index 9e1cbb1d55e929235f1cc9d82850fcbcd3843e26..caddd0964b3712eeb982d1d0083260effef4577e 100644 --- a/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn @@ -93,9 +93,9 @@ ohos_fuzztest("IpcServerStubFuzzTest") { "${utils_path}:devicemanagerutils", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//base/security/deviceauth/services:deviceauth_sdk", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice", ] diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 93525f79717375b31fb80936ae38c59302df2d4a..6c86ae43457683e56a5ae173da7cc71acd4c34ee 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -623,9 +623,9 @@ ohos_static_library("device_manager_test") { "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", "//base/security/deviceauth/services:deviceauth_sdk", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", ] if (os_account_part_exists) {