设备认证部件名和路径修改

Signed-off-by: heyinshen <heyinshen1@huawei.com>
This commit is contained in:
heyinshen
2022-06-16 17:19:06 +08:00
parent 9057f23857
commit 69dba6b0de
15 changed files with 33 additions and 33 deletions
+1 -1
View File
@@ -31,7 +31,7 @@
"dsoftbus_standard",
"utils_base",
"napi",
"deviceauth_standard"
"device_auth"
],
"third_party": [
"json",
+2 -2
View File
@@ -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",
]
+4 -4
View File
@@ -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",
+7 -7
View File
@@ -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) {
@@ -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",
@@ -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",
@@ -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",
]
@@ -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",
]
@@ -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",
]
+2 -2
View File
@@ -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",
]
@@ -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",
]
@@ -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",
]
+2 -2
View File
@@ -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",
]
+3 -3
View File
@@ -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) {
+2 -2
View File
@@ -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",