From 69dba6b0dec92bc2bd3bfd07a92dcd6eea06672f Mon Sep 17 00:00:00 2001 From: heyinshen Date: Thu, 16 Jun 2022 17:19:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=AE=A4=E8=AF=81=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E5=92=8C=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: heyinshen --- bundle.json | 2 +- ext/no_interaction_auth/BUILD.gn | 4 ++-- ext/pin_auth/BUILD.gn | 8 ++++---- services/devicemanagerservice/BUILD.gn | 14 +++++++------- test/benchmarktest/device_manager_fa_test/BUILD.gn | 2 +- test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn | 2 +- test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn | 2 +- test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn | 2 +- test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn | 4 ++-- test/fuzztest/ipccmdregister_fuzzer/BUILD.gn | 4 ++-- test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn | 4 ++-- test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn | 4 ++-- test/fuzztest/ipcserverstub_fuzzer/BUILD.gn | 4 ++-- test/unittest/BUILD.gn | 6 +++--- utils/BUILD.gn | 4 ++-- 15 files changed, 33 insertions(+), 33 deletions(-) diff --git a/bundle.json b/bundle.json index 082cdd9c..54f100e2 100644 --- a/bundle.json +++ b/bundle.json @@ -31,7 +31,7 @@ "dsoftbus_standard", "utils_base", "napi", - "deviceauth_standard" + "device_auth" ], "third_party": [ "json", diff --git a/ext/no_interaction_auth/BUILD.gn b/ext/no_interaction_auth/BUILD.gn index 1ef6a856..bad36a25 100644 --- a/ext/no_interaction_auth/BUILD.gn +++ b/ext/no_interaction_auth/BUILD.gn @@ -54,7 +54,7 @@ if (defined(ohos_lite)) { "//utils/system/safwk/native/include", "//base/notification/common_event_service/frameworks/core/include", "//base/notification/common_event_service/interfaces/innerkits/native/include", - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "//base/startup/syspara_lite/interfaces/kits", "//base/startup/syspara_lite/adapter/native/syspara/include", ] @@ -69,7 +69,7 @@ if (defined(ohos_lite)) { "${aaservices_path}/abilitymgr:abilityms", "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", - "//base/security/deviceauth/services:deviceauth_sdk", + "//base/security/device_auth/services:deviceauth_sdk", "//foundation/distributedhardware/device_manager/services/devicemanagerservice:devicemanagerservice", "//utils/native/base:utils", ] diff --git a/ext/pin_auth/BUILD.gn b/ext/pin_auth/BUILD.gn index 886c3323..4bbe970f 100644 --- a/ext/pin_auth/BUILD.gn +++ b/ext/pin_auth/BUILD.gn @@ -54,7 +54,7 @@ if (defined(ohos_lite)) { "//utils/system/safwk/native/include", "//base/notification/ces_lite/frameworks/core/include", "//base/notification/ces_lite/interfaces/innerkits/native/include", - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "//base/startup/syspara_lite/interfaces/kits", "//base/startup/syspara_lite/adapter/native/syspara/include", ] @@ -70,7 +70,7 @@ if (defined(ohos_lite)) { "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//base/security/deviceauth/services:deviceauth_sdk", + "//base/security/device_auth/services:deviceauth_sdk", "//foundation/communication/dsoftbus/sdk:softbus_client", "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", "//foundation/distributedschedule/samgr_lite/samgr:samgr", @@ -122,7 +122,7 @@ if (defined(ohos_lite)) { "//utils/system/safwk/native/include", "//base/notification/common_event_service/frameworks/core/include", "//base/notification/common_event_service/interfaces/innerkits/native/include", - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "//base/startup/syspara_lite/interfaces/kits", "//base/startup/syspara_lite/adapter/native/syspara/include", ] @@ -140,7 +140,7 @@ if (defined(ohos_lite)) { "${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", + "//base/security/device_auth/services:deviceauth_sdk", "//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr", "//foundation/distributedhardware/device_manager/services/devicemanagerservice:devicemanagerservice", "//utils/native/base:utils", diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn index 2be7fed6..e10e1e7c 100755 --- a/services/devicemanagerservice/BUILD.gn +++ b/services/devicemanagerservice/BUILD.gn @@ -44,7 +44,7 @@ if (defined(ohos_lite)) { "${common_path}/include", "${common_path}/include/ipc", "${common_path}/include/ipc/model", - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "//third_party/json/include", "${utils_path}/include", "${utils_path}/include/permission/lite", @@ -55,7 +55,7 @@ if (defined(ohos_lite)) { ] include_dirs += [ - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include", "//utils/native/lite/include", "//utils/system/safwk/native/include", @@ -117,7 +117,7 @@ if (defined(ohos_lite)) { "${devicemanager_path}/interfaces/inner_kits/native_cpp:devicemanagersdk_mini", "${utils_path}:devicemanagerutils_mini", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_static", - "//base/security/deviceauth/services:deviceauth", + "//base/security/device_auth/services:deviceauth", "//base/startup/syspara_lite/frameworks/parameter/src:sysparam", "//foundation/communication/dsoftbus/sdk:softbus_client", "//foundation/distributedschedule/samgr_lite/samgr", @@ -157,7 +157,7 @@ if (defined(ohos_lite)) { "${innerkits_path}/native_cpp/include/ipc/lite", ] include_dirs += [ - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include", "//utils/native/lite/include", "//utils/system/safwk/native/include", @@ -213,7 +213,7 @@ if (defined(ohos_lite)) { "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//base/security/deviceauth/services:deviceauth_sdk", + "//base/security/device_auth/services:deviceauth_sdk", "//base/startup/syspara_lite/frameworks/parameter/src:sysparam", "//foundation/communication/dsoftbus/sdk:softbus_client", "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", @@ -254,7 +254,7 @@ if (defined(ohos_lite)) { "${utils_path}/include", "${utils_path}/include/fwkload/standard", "${utils_path}/include/permission/standard", - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "//third_party/json/include", ] @@ -303,7 +303,7 @@ if (defined(ohos_lite)) { "${aaservices_path}/abilitymgr:abilityms", "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", - "//base/security/deviceauth/services:deviceauth_sdk", + "//base/security/device_auth/services:deviceauth_sdk", ] if (os_account_part_exists) { diff --git a/test/benchmarktest/device_manager_fa_test/BUILD.gn b/test/benchmarktest/device_manager_fa_test/BUILD.gn index 3015cdbf..d79ddfcb 100644 --- a/test/benchmarktest/device_manager_fa_test/BUILD.gn +++ b/test/benchmarktest/device_manager_fa_test/BUILD.gn @@ -42,7 +42,7 @@ ohos_benchmarktest("DeviceManagerFaTest") { "${common_path}/include/show_confirm_dialog/dialog_ui/js:dialog_js_files_etc", "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", - "//base/security/deviceauth/services:deviceauth_sdk", + "//base/security/device_auth/services:deviceauth_sdk", "//foundation/arkui/napi:ace_napi", "//foundation/communication/dsoftbus/sdk:softbus_client", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", diff --git a/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn b/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn index d55ccc4d..6afd94d3 100644 --- a/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn +++ b/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn @@ -61,7 +61,7 @@ ohos_fuzztest("DeviceManagerImplFuzzTest") { "//foundation/distributedhardware/device_manager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", "//foundation/distributedhardware/device_manager/ext/mini/common/include", - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "${services_path}/include/ability", "${services_path}/include/config", "//utils/native/lite/include", diff --git a/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn b/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn index 92a33f9c..7f2c5a9e 100644 --- a/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn +++ b/test/fuzztest/devicemanagernotify_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("DeviceManagerNotifyFuzzTest") { "//foundation/distributedhardware/device_manager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", "//foundation/distributedhardware/device_manager/ext/mini/common/include", - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "${services_path}/include/ability", "${services_path}/include/config", ] diff --git a/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn b/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn index 64f686ee..f5b4794f 100644 --- a/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn +++ b/test/fuzztest/devicemanagerservice_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("DeviceManagerServiceFuzzTest") { "//foundation/distributedhardware/device_manager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", "//foundation/distributedhardware/device_manager/ext/mini/common/include", - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "${services_path}/include/ability", "${services_path}/include/config", ] diff --git a/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn b/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn index 3c6f6aaa..8683b242 100644 --- a/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn @@ -60,7 +60,7 @@ ohos_fuzztest("IpcClientManagerFuzzTest") { "//foundation/distributedhardware/device_manager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", "//foundation/distributedhardware/device_manager/ext/mini/common/include", - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "${services_path}/include/ability", "${services_path}/include/config", "//utils/native/lite/include", @@ -92,7 +92,7 @@ ohos_fuzztest("IpcClientManagerFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", - "//base/security/deviceauth/services:deviceauth_sdk", + "//base/security/device_auth/services:deviceauth_sdk", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/distributedhardware/device_manager/services/devicemanagerservice:devicemanagerservice", ] diff --git a/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn b/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn index 88a737f2..0c7a26f5 100644 --- a/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn +++ b/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn @@ -60,7 +60,7 @@ ohos_fuzztest("IpcCmdRegisterFuzzTest") { "//foundation/distributedhardware/device_manager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", "//foundation/distributedhardware/device_manager/ext/mini/common/include", - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "${services_path}/include/ability", "${services_path}/include/config", "//utils/native/lite/include", @@ -93,7 +93,7 @@ ohos_fuzztest("IpcCmdRegisterFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", - "//base/security/deviceauth/services:deviceauth_sdk", + "//base/security/device_auth/services:deviceauth_sdk", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/distributedhardware/device_manager/services/devicemanagerservice:devicemanagerservice", ] diff --git a/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn b/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn index 0bdd44de..85d574ad 100644 --- a/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn @@ -60,7 +60,7 @@ ohos_fuzztest("IpcServerClientProxyFuzzTest") { "//foundation/distributedhardware/device_manager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", "//foundation/distributedhardware/device_manager/ext/mini/common/include", - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "${services_path}/include/ability", "${services_path}/include/config", "//utils/native/lite/include", @@ -92,7 +92,7 @@ ohos_fuzztest("IpcServerClientProxyFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", - "//base/security/deviceauth/services:deviceauth_sdk", + "//base/security/device_auth/services:deviceauth_sdk", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/distributedhardware/device_manager/services/devicemanagerservice:devicemanagerservice", ] diff --git a/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn b/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn index 978b0a07..cdb9e0ad 100644 --- a/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn @@ -60,7 +60,7 @@ ohos_fuzztest("IpcServerListenerFuzzTest") { "//foundation/distributedhardware/device_manager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", "//foundation/distributedhardware/device_manager/ext/mini/common/include", - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "${services_path}/include/ability", "${services_path}/include/config", "//utils/native/lite/include", @@ -92,7 +92,7 @@ ohos_fuzztest("IpcServerListenerFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", - "//base/security/deviceauth/services:deviceauth_sdk", + "//base/security/device_auth/services:deviceauth_sdk", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/distributedhardware/device_manager/services/devicemanagerservice:devicemanagerservice", ] diff --git a/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn b/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn index 3a1a18d1..57d27f1e 100644 --- a/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn @@ -60,7 +60,7 @@ ohos_fuzztest("IpcServerStubFuzzTest") { "//foundation/distributedhardware/device_manager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", "//foundation/distributedhardware/device_manager/ext/mini/common/include", - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "${services_path}/include/ability", "${services_path}/include/config", "//utils/native/lite/include", @@ -92,7 +92,7 @@ ohos_fuzztest("IpcServerStubFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", - "//base/security/deviceauth/services:deviceauth_sdk", + "//base/security/device_auth/services:deviceauth_sdk", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/distributedhardware/device_manager/services/devicemanagerservice:devicemanagerservice", ] diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 8fd97f00..887aa266 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -492,7 +492,7 @@ config("device_manager_test_common_public_config") { "//foundation/distributedhardware/device_manager/ext/profile/include", "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include", "//foundation/distributedhardware/device_manager/ext/mini/common/include", - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "${services_path}/include/ability", "${services_path}/include/config", ] @@ -570,7 +570,7 @@ config("device_manager_test_common_public") { "//foundation/communication/dsoftbus/interfaces/kits/common", "//foundation/communication/dsoftbus/interfaces/kits/discovery", "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "//foundation/distributedschedule/safwk/services/safwk", ] @@ -624,7 +624,7 @@ ohos_static_library("device_manager_test") { "${aaservices_path}/abilitymgr:abilityms", "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", - "//base/security/deviceauth/services:deviceauth_sdk", + "//base/security/device_auth/services:deviceauth_sdk", ] if (os_account_part_exists) { diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 760eb0b6..135f419a 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -29,7 +29,7 @@ if (defined(ohos_lite)) { ] include_dirs += [ - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include", "//utils/native/lite/include", "//utils/system/safwk/native/include", @@ -75,7 +75,7 @@ if (defined(ohos_lite)) { "include/permission/lite", ] include_dirs += [ - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include", "//utils/native/lite/include", "//utils/system/safwk/native/include",