From be825e1db21c71a085815466368960f175e1b8f1 Mon Sep 17 00:00:00 2001 From: fuzikun Date: Mon, 27 Feb 2023 22:04:30 +0800 Subject: [PATCH] device_auth rename innerkits to inner_api Signed-off-by: fuzikun --- services/distributedfiledaemon/BUILD.gn | 3 +-- .../test/unittest/BUILD.gn | 17 ++++++++--------- test/moduletest/BUILD.gn | 3 +-- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/services/distributedfiledaemon/BUILD.gn b/services/distributedfiledaemon/BUILD.gn index ea0db9b3f..7c1649371 100644 --- a/services/distributedfiledaemon/BUILD.gn +++ b/services/distributedfiledaemon/BUILD.gn @@ -17,7 +17,6 @@ ohos_shared_library("libdistributedfiledaemon") { include_dirs = [ "include", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include", - "//base/security/device_auth/interfaces/innerkits", "//third_party/json/include", ] @@ -40,13 +39,13 @@ ohos_shared_library("libdistributedfiledaemon") { deps = [ "${utils_path}:libdistributedfileutils", - "//base/security/device_auth/services:deviceauth_sdk", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", ] external_deps = [ "ability_base:want", "common_event_service:cesfwk_innerkits", "dataclassification:data_transit_mgr", + "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "init:libbegetutil", "ipc:ipc_core", diff --git a/services/distributedfiledaemon/test/unittest/BUILD.gn b/services/distributedfiledaemon/test/unittest/BUILD.gn index fbc206051..e57f007e7 100644 --- a/services/distributedfiledaemon/test/unittest/BUILD.gn +++ b/services/distributedfiledaemon/test/unittest/BUILD.gn @@ -21,7 +21,6 @@ config("module_private_config") { include_dirs = [ "${services_path}/distributedfiledaemon/include", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include", - "//base/security/device_auth/interfaces/innerkits", "//third_party/json/include", ] } @@ -55,7 +54,6 @@ ohos_unittest("device_manager_agent_test") { deps = [ "${utils_path}:libdistributedfileutils", - "//base/security/device_auth/services:deviceauth_sdk", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//third_party/googletest:gtest_main", ] @@ -64,6 +62,7 @@ ohos_unittest("device_manager_agent_test") { "ability_base:want", "common_event_service:cesfwk_innerkits", "dataclassification:data_transit_mgr", + "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "init:libbegetutil", "ipc:ipc_core", @@ -103,7 +102,6 @@ ohos_unittest("os_account_observer_test") { deps = [ "${utils_path}:libdistributedfileutils", - "//base/security/device_auth/services:deviceauth_sdk", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//third_party/googletest:gtest_main", ] @@ -112,6 +110,7 @@ ohos_unittest("os_account_observer_test") { "ability_base:want", "common_event_service:cesfwk_innerkits", "dataclassification:data_transit_mgr", + "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "init:libbegetutil", "ipc:ipc_core", @@ -150,7 +149,6 @@ ohos_unittest("devsl_dispatcher_test") { deps = [ "${utils_path}:libdistributedfileutils", - "//base/security/device_auth/services:deviceauth_sdk", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//third_party/googletest:gtest_main", ] @@ -159,6 +157,7 @@ ohos_unittest("devsl_dispatcher_test") { "ability_base:want", "common_event_service:cesfwk_innerkits", "dataclassification:data_transit_mgr", + "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "init:libbegetutil", "ipc:ipc_core", @@ -197,7 +196,6 @@ ohos_unittest("kernel_talker_test") { deps = [ "${utils_path}:libdistributedfileutils", - "//base/security/device_auth/services:deviceauth_sdk", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//third_party/googletest:gtest_main", ] @@ -206,6 +204,7 @@ ohos_unittest("kernel_talker_test") { "ability_base:want", "common_event_service:cesfwk_innerkits", "dataclassification:data_transit_mgr", + "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "init:libbegetutil", "ipc:ipc_core", @@ -244,7 +243,6 @@ ohos_unittest("session_pool_test") { deps = [ "${utils_path}:libdistributedfileutils", - "//base/security/device_auth/services:deviceauth_sdk", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//third_party/googletest:gtest_main", ] @@ -253,6 +251,7 @@ ohos_unittest("session_pool_test") { "ability_base:want", "common_event_service:cesfwk_innerkits", "dataclassification:data_transit_mgr", + "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "init:libbegetutil", "ipc:ipc_core", @@ -291,7 +290,6 @@ ohos_unittest("softbus_agent_test") { deps = [ "${utils_path}:libdistributedfileutils", - "//base/security/device_auth/services:deviceauth_sdk", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//third_party/googletest:gtest_main", ] @@ -300,6 +298,7 @@ ohos_unittest("softbus_agent_test") { "ability_base:want", "common_event_service:cesfwk_innerkits", "dataclassification:data_transit_mgr", + "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "init:libbegetutil", "ipc:ipc_core", @@ -338,7 +337,6 @@ ohos_unittest("softbus_session_dispatcher_test") { deps = [ "${utils_path}:libdistributedfileutils", - "//base/security/device_auth/services:deviceauth_sdk", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//third_party/googletest:gtest_main", ] @@ -347,6 +345,7 @@ ohos_unittest("softbus_session_dispatcher_test") { "ability_base:want", "common_event_service:cesfwk_innerkits", "dataclassification:data_transit_mgr", + "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "init:libbegetutil", "ipc:ipc_core", @@ -385,7 +384,6 @@ ohos_unittest("softbus_session_test") { deps = [ "${utils_path}:libdistributedfileutils", - "//base/security/device_auth/services:deviceauth_sdk", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//third_party/googletest:gtest_main", ] @@ -394,6 +392,7 @@ ohos_unittest("softbus_session_test") { "ability_base:want", "common_event_service:cesfwk_innerkits", "dataclassification:data_transit_mgr", + "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "init:libbegetutil", "ipc:ipc_core", diff --git a/test/moduletest/BUILD.gn b/test/moduletest/BUILD.gn index 7596914ff..312a5333f 100644 --- a/test/moduletest/BUILD.gn +++ b/test/moduletest/BUILD.gn @@ -24,7 +24,6 @@ config("module_private_config") { "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//foundation/communication/dsoftbus/interfaces/kits/bus_center", "//foundation/communication/dsoftbus/interfaces/kits/common", - "//base/security/device_auth/interfaces/innerkits", "//third_party/json/include", ] } @@ -63,7 +62,6 @@ ohos_moduletest("DistributedFileDaemonServiceTest") { deps = [ "${utils_path}:libdistributedfileutils", - "//base/security/device_auth/services:deviceauth_sdk", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/filemanagement/dfs_service/services/distributedfiledaemon:libdistributedfiledaemon", "//third_party/googletest:gmock", @@ -74,6 +72,7 @@ ohos_moduletest("DistributedFileDaemonServiceTest") { "ability_base:want", "common_event_service:cesfwk_innerkits", "dataclassification:data_transit_mgr", + "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "init:libbegetutil", "ipc:ipc_core", -- Gitee