From d97762b3f5263d2a301aa03b3423fe05048f83c5 Mon Sep 17 00:00:00 2001 From: wx1094762 Date: Fri, 6 May 2022 10:04:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wx1094762 Change-Id: Iefbe83723eecbffe3f2313bd1a5ca8d3a27c07c5 --- devicemanager.gni | 3 ++- ext/no_interaction_auth/BUILD.gn | 6 +++--- ext/pin_auth/BUILD.gn | 6 +++--- services/devicemanagerservice/BUILD.gn | 6 +++--- test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn | 6 +++--- test/fuzztest/ipccmdregister_fuzzer/BUILD.gn | 6 +++--- test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn | 6 +++--- test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn | 6 +++--- test/fuzztest/ipcserverstub_fuzzer/BUILD.gn | 6 +++--- test/unittest/BUILD.gn | 6 +++--- 10 files changed, 29 insertions(+), 28 deletions(-) diff --git a/devicemanager.gni b/devicemanager.gni index 18cce5ad6..8f9b459c9 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 9aad3eaed..5c7739177 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 477009980..01e0c8b59 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 971310801..97962edb3 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 638f73046..2c0a08fd3 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 5cf5188fd..1a8de4e6f 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 4ba1a3b68..2651a720a 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 cb04a36f9..c2c6aa17c 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 9e1cbb1d5..caddd0964 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 93525f797..6c86ae434 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) { -- Gitee