From 4a905e61e5464cd062de3babf2f2ac9d10f3e247 Mon Sep 17 00:00:00 2001 From: shiqichang Date: Fri, 13 May 2022 10:36:51 +0800 Subject: [PATCH] =?UTF-8?q?foudation=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shiqichang Change-Id: I37c2687207683841ac89053b05d48db86e94e989 --- devicemanager.gni | 2 ++ 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 +++--- utils/BUILD.gn | 2 +- 11 files changed, 30 insertions(+), 28 deletions(-) diff --git a/devicemanager.gni b/devicemanager.gni index 7e30bc487..d501923b4 100644 --- a/devicemanager.gni +++ b/devicemanager.gni @@ -19,6 +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" +aainnerkits_path = "//foundation/aafwk/standard/interfaces/innerkits" +aaservices_path = "//foundation/aafwk/standard/services" #--------------------------softbus----------------------------------# diff --git a/ext/no_interaction_auth/BUILD.gn b/ext/no_interaction_auth/BUILD.gn index 9aad3eaed..b56f7543a 100644 --- a/ext/no_interaction_auth/BUILD.gn +++ b/ext/no_interaction_auth/BUILD.gn @@ -65,12 +65,12 @@ if (defined(ohos_lite)) { ] deps = [ + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", "${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", "//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 4482cc08c..7040cf991 100644 --- a/ext/pin_auth/BUILD.gn +++ b/ext/pin_auth/BUILD.gn @@ -134,14 +134,14 @@ if (defined(ohos_lite)) { ] deps = [ + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", "${ext_path}/pin_auth/input_pin_dialog/dialog_ui/js:dialog_js_files_etc", "${ext_path}/pin_auth/show_pin_dialog/dialog_ui/js:dialog_js_files_etc", "${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", "//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr", "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice", "//utils/native/base:utils", diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn index eefef4390..23a42d80d 100755 --- a/services/devicemanagerservice/BUILD.gn +++ b/services/devicemanagerservice/BUILD.gn @@ -299,12 +299,12 @@ if (defined(ohos_lite)) { ] deps = [ + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", "${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", ] if (os_account_part_exists) { diff --git a/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn b/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn index a04cc37e9..5e07aa175 100644 --- a/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn @@ -87,13 +87,13 @@ ohos_fuzztest("IpcClientManagerFuzzTest") { sources = [ "ipc_client_manager_fuzzer.cpp" ] deps = [ + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", "${innerkits_path}/native_cpp:devicemanagersdk", "${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", "//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 a14746989..ba39d03e2 100644 --- a/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn +++ b/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn @@ -88,13 +88,13 @@ ohos_fuzztest("IpcCmdRegisterFuzzTest") { sources = [ "ipc_cmd_register_fuzzer.cpp" ] deps = [ + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", "${innerkits_path}/native_cpp:devicemanagersdk", "${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", "//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 741f460d4..8ecc8590f 100644 --- a/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn @@ -87,13 +87,13 @@ ohos_fuzztest("IpcServerClientProxyFuzzTest") { sources = [ "ipc_server_client_proxy_fuzzer.cpp" ] deps = [ + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", "${innerkits_path}/native_cpp:devicemanagersdk", "${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", "//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 49d9fc61d..f7cab81e7 100644 --- a/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn @@ -87,13 +87,13 @@ ohos_fuzztest("IpcServerListenerFuzzTest") { sources = [ "ipc_server_listener_fuzzer.cpp" ] deps = [ + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", "${innerkits_path}/native_cpp:devicemanagersdk", "${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", "//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 445556d0c..1bfae7dca 100644 --- a/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn @@ -87,13 +87,13 @@ ohos_fuzztest("IpcServerStubFuzzTest") { sources = [ "ipc_server_stub_fuzzer.cpp" ] deps = [ + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", "${innerkits_path}/native_cpp:devicemanagersdk", "${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", "//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 5a4e555e1..c784979ea 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -620,12 +620,12 @@ ohos_static_library("device_manager_test") { ] deps = [ + "${aainnerkits_path}/ability_manager:ability_manager", + "${aainnerkits_path}/want:want", + "${aaservices_path}/abilitymgr:abilityms", "${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", ] if (os_account_part_exists) { diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 8c17c8782..45e102e99 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -152,7 +152,7 @@ if (defined(ohos_lite)) { ] deps = [ - "//foundation/aafwk/standard/interfaces/innerkits/want:want", + "${aainnerkits_path}/want:want", "//third_party/mbedtls:mbedtls_shared", ] -- Gitee