From bf032f55eae700669bd259d7e177138b362f9f5a Mon Sep 17 00:00:00 2001 From: fuzikun Date: Mon, 6 Mar 2023 21:20:34 +0800 Subject: [PATCH] optimize the dependency on device_auth module Signed-off-by: fuzikun --- ext/pin_auth/BUILD.gn | 1 + services/implementation/BUILD.gn | 2 +- .../dmdiscoverymanager_fuzzer/BUILD.gn | 2 + test/fuzztest/pinauth_fuzzer/BUILD.gn | 2 +- test/fuzztest/pinauthui_fuzzer/BUILD.gn | 2 +- test/unittest/BUILD.gn | 76 ++++++++++++++++++- 6 files changed, 80 insertions(+), 5 deletions(-) diff --git a/ext/pin_auth/BUILD.gn b/ext/pin_auth/BUILD.gn index 1de970ffd..11da26ed9 100644 --- a/ext/pin_auth/BUILD.gn +++ b/ext/pin_auth/BUILD.gn @@ -141,6 +141,7 @@ if (defined(ohos_lite)) { external_deps = [ "ability_base:want", + "device_auth:deviceauth_sdk", "init:libbegetutil", ] diff --git a/services/implementation/BUILD.gn b/services/implementation/BUILD.gn index 551b67b44..4868739ae 100644 --- a/services/implementation/BUILD.gn +++ b/services/implementation/BUILD.gn @@ -208,7 +208,6 @@ if (defined(ohos_lite)) { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", - "//base/security/device_auth/services:deviceauth_sdk", ] if (os_account_part_exists) { @@ -224,6 +223,7 @@ if (defined(ohos_lite)) { "c_utils:utils", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", + "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "init:libbegetutil", "ipc:ipc_core", diff --git a/test/fuzztest/dmdiscoverymanager_fuzzer/BUILD.gn b/test/fuzztest/dmdiscoverymanager_fuzzer/BUILD.gn index d51df28d5..4704020b2 100644 --- a/test/fuzztest/dmdiscoverymanager_fuzzer/BUILD.gn +++ b/test/fuzztest/dmdiscoverymanager_fuzzer/BUILD.gn @@ -50,6 +50,8 @@ ohos_fuzztest("DmDiscoveryManagerFuzzTest") { "DH_LOG_TAG=\"DmDiscoveryManagerFuzzTest\"", "LOG_DOMAIN=0xD004100", ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/pinauth_fuzzer/BUILD.gn b/test/fuzztest/pinauth_fuzzer/BUILD.gn index 334a865e8..23e8b8500 100644 --- a/test/fuzztest/pinauth_fuzzer/BUILD.gn +++ b/test/fuzztest/pinauth_fuzzer/BUILD.gn @@ -54,7 +54,6 @@ ohos_fuzztest("PinAuthFuzzTest") { "//utils/system/safwk/native/include", "//base/notification/common_event_service/frameworks/core/include", "//base/notification/common_event_service/interfaces/innerkits/native/include", - "//base/security/device_auth/interfaces/inner_api", "//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core/include", "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", "//foundation/communication/dsoftbus/interfaces/kits/bus_center", @@ -93,6 +92,7 @@ ohos_fuzztest("PinAuthFuzzTest") { external_deps = [ "ability_base:want", + "device_auth:deviceauth_sdk", "init:libbegetutil", ] } diff --git a/test/fuzztest/pinauthui_fuzzer/BUILD.gn b/test/fuzztest/pinauthui_fuzzer/BUILD.gn index efb91008b..c811a611c 100644 --- a/test/fuzztest/pinauthui_fuzzer/BUILD.gn +++ b/test/fuzztest/pinauthui_fuzzer/BUILD.gn @@ -54,7 +54,6 @@ ohos_fuzztest("PinAuthUiFuzzTest") { "//utils/system/safwk/native/include", "//base/notification/common_event_service/frameworks/core/include", "//base/notification/common_event_service/interfaces/innerkits/native/include", - "//base/security/device_auth/interfaces/inner_api", "//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core/include", "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", "//foundation/communication/dsoftbus/interfaces/kits/bus_center", @@ -93,6 +92,7 @@ ohos_fuzztest("PinAuthUiFuzzTest") { external_deps = [ "ability_base:want", + "device_auth:deviceauth_sdk", "init:libbegetutil", ] } diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 0ab8276d2..49f2d32b5 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -66,6 +66,8 @@ ohos_unittest("UTTest_pin_auth") { sources = [ "UTTest_pin_auth.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_pin_auth }}} @@ -79,6 +81,8 @@ ohos_unittest("UTTest_pin_auth_ui") { sources = [ "UTTest_pin_auth_ui.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_pin_auth_ui }}} @@ -90,6 +94,8 @@ ohos_unittest("UTTest_ipc_cmd_register") { sources = [ "UTTest_ipc_cmd_register.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_ipc_cmd_register }}} @@ -104,6 +110,8 @@ ohos_unittest("UTTest_dm_common_event_manager") { sources = [ "UTTest_dm_common_event_manager.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_dm_common_event_manager }}} @@ -115,6 +123,8 @@ ohos_unittest("device_manager_impl_test") { sources = [ "device_manager_impl_test.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest device_manager_impl_test }}} @@ -126,6 +136,8 @@ ohos_unittest("UTTest_dm_credential_manager") { sources = [ "UTTest_dm_credential_manager.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_dm_credential_manager }}} @@ -137,6 +149,8 @@ ohos_unittest("UTTest_device_manager_service") { sources = [ "UTTest_device_manager_service.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_device_manager_service }}} @@ -148,6 +162,8 @@ ohos_unittest("UTTest_hichain_connector") { sources = [ "UTTest_hichain_connector.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_hichain_connector }}} @@ -179,6 +195,7 @@ ohos_unittest("UTTest_softbus_connector") { deps = [ ":device_manager_test_common" ] external_deps = [ + "device_auth:deviceauth_sdk", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", ] @@ -195,6 +212,7 @@ ohos_unittest("UTTest_softbus_listener") { deps = [ ":device_manager_test_common" ] external_deps = [ + "device_auth:deviceauth_sdk", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", ] @@ -211,6 +229,7 @@ ohos_unittest("UTTest_softbus_session") { deps = [ ":device_manager_test_common" ] external_deps = [ + "device_auth:deviceauth_sdk", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", ] @@ -225,6 +244,8 @@ ohos_unittest("UTTest_dm_adapter_manager") { sources = [ "UTTest_dm_adapter_manager.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_dm_adapter_manager }}} @@ -239,6 +260,8 @@ ohos_unittest("UTTest_dm_anonymous") { ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_dm_anonymous }}} @@ -250,6 +273,8 @@ ohos_unittest("UTTest_dm_timer") { sources = [ "UTTest_dm_timer.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_dm_timer }}} @@ -261,6 +286,8 @@ ohos_unittest("UTTest_ipc_client_manager") { sources = [ "UTTest_ipc_client_manager.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_ipc_client_manager }}} @@ -272,6 +299,8 @@ ohos_unittest("UTTest_ipc_client_proxy") { sources = [ "UTTest_ipc_client_proxy.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_ipc_client_proxy }}} @@ -283,6 +312,8 @@ ohos_unittest("UTTest_ipc_client_stub") { sources = [ "UTTest_ipc_client_stub.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_ipc_client_stub }}} @@ -294,6 +325,8 @@ ohos_unittest("UTTest_ipc_server_client_proxy") { sources = [ "UTTest_ipc_server_client_proxy.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_ipc_server_client_proxy }}} @@ -305,6 +338,8 @@ ohos_unittest("UTTest_ipc_server_listener") { sources = [ "UTTest_ipc_server_listener.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_ipc_server_listener }}} @@ -316,6 +351,8 @@ ohos_unittest("UTTest_ipc_server_stub") { sources = [ "UTTest_ipc_server_stub.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_ipc_server_stub }}} @@ -327,6 +364,8 @@ ohos_unittest("UTTest_device_manager_impl") { sources = [ "UTTest_device_manager_impl.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_device_manager_impl }}} @@ -338,6 +377,8 @@ ohos_unittest("UTTest_multiple_user_connector") { sources = [ "UTTest_multiple_user_connector.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_multiple_user_connector }}} @@ -349,6 +390,8 @@ ohos_unittest("UTTest_permission_manager") { sources = [ "UTTest_permission_manager.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_permission_manager }}} @@ -360,6 +403,8 @@ ohos_unittest("UTTest_device_manager_notify") { sources = [ "UTTest_device_manager_notify.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_device_manager_notify }}} @@ -371,6 +416,8 @@ ohos_unittest("UTTest_ipc_client_server_proxy") { sources = [ "UTTest_ipc_client_server_proxy.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_ipc_client_server_proxy }}} @@ -384,6 +431,7 @@ ohos_unittest("UTTest_dm_device_state_manager") { deps = [ ":device_manager_test_common" ] external_deps = [ + "device_auth:deviceauth_sdk", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", ] @@ -400,6 +448,8 @@ ohos_unittest("UTTest_dm_dfx") { sources = [ "UTTest_dm_dfx.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_dm_dfx }}} @@ -411,6 +461,8 @@ ohos_unittest("UTTest_dm_discovery_filter") { sources = [ "UTTest_dm_discovery_filter.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_dm_discovery_filter }}} @@ -428,6 +480,8 @@ ohos_unittest("UTTest_device_manager_service_impl") { ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_device_manager_service_impl }}} @@ -443,6 +497,8 @@ ohos_unittest("UTTest_device_manager_service_listener") { ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest UTTest_device_manager_service_listener }}} @@ -454,6 +510,8 @@ ohos_unittest("UTTest_auth_message_processor") { sources = [ "UTTest_auth_message_processor.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UTTest_auth_message_processor }}} @@ -465,6 +523,8 @@ ohos_unittest("UTTest_auth_response_state") { sources = [ "UTTest_auth_response_state.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UTTest_auth_response_state }}} @@ -476,6 +536,8 @@ ohos_unittest("UTTest_auth_request_state") { sources = [ "UTTest_auth_request_state.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UTTest_auth_request_state }}} @@ -487,6 +549,8 @@ ohos_unittest("ipc_client_manager_test") { sources = [ "ipc_client_manager_test.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UnitTest ipc_client_manager_test }}} @@ -498,6 +562,8 @@ ohos_unittest("UTTest_dm_auth_manager") { sources = [ "UTTest_dm_auth_manager.cpp" ] deps = [ ":device_manager_test_common" ] + + external_deps = [ "device_auth:deviceauth_sdk" ] } ## UTTest_dm_auth_manager }}} @@ -521,7 +587,10 @@ ohos_unittest("UTTest_dm_discovery_manager") { deps = [ ":device_manager_test_common" ] - external_deps = [ "hitrace_native:hitrace_meter" ] + external_deps = [ + "device_auth:deviceauth_sdk", + "hitrace_native:hitrace_meter", + ] } ## UnitTest UTTest_dm_discovery_manager }}} @@ -545,7 +614,10 @@ ohos_unittest("UTTest_dm_publish_manager") { deps = [ ":device_manager_test_common" ] - external_deps = [ "hitrace_native:hitrace_meter" ] + external_deps = [ + "device_auth:deviceauth_sdk", + "hitrace_native:hitrace_meter", + ] } ## UnitTest UTTest_dm_publish_manager }}} -- Gitee