From 2419ff3e9a86ac0661f725e2faedf29e5e5f51f9 Mon Sep 17 00:00:00 2001 From: lfSeanDragon <18309220525@163.com> Date: Sat, 6 Sep 2025 09:52:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E8=80=A6device=5Fauth=E4=B8=8Edsoftbu?= =?UTF-8?q?s=E9=83=A8=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/isoauthtask_fuzzer/BUILD.gn | 8 ++++++-- .../pake/standardexchangetask_fuzzer/BUILD.gn | 8 ++++++-- .../creds_manager/credsmanager_fuzzer/BUILD.gn | 14 ++++++++++---- test/fuzztest/devauth_fuzzer/BUILD.gn | 8 ++++++-- test/fuzztest/devauthinterface_fuzzer/BUILD.gn | 4 +++- .../devauthservaddmembertogroup_fuzzer/BUILD.gn | 6 ++++-- .../BUILD.gn | 7 +++++-- .../devauthservauthdevice_fuzzer/BUILD.gn | 6 ++++-- .../devauthservcancelauthrequest_fuzzer/BUILD.gn | 6 ++++-- .../devauthservcancelbindrequest_fuzzer/BUILD.gn | 6 ++++-- .../devauthservcheckaccesstogroup_fuzzer/BUILD.gn | 6 ++++-- .../devauthservcreategroup_fuzzer/BUILD.gn | 6 ++++-- .../devauthservdeletegroup_fuzzer/BUILD.gn | 6 ++++-- .../BUILD.gn | 6 ++++-- .../BUILD.gn | 6 ++++-- .../devauthservgetdeviceinfobyid_fuzzer/BUILD.gn | 6 ++++-- .../devauthservgetgroupinfo_fuzzer/BUILD.gn | 6 ++++-- .../devauthservgetgroupinfobyid_fuzzer/BUILD.gn | 6 ++++-- .../devauthservgetjoinedgroups_fuzzer/BUILD.gn | 6 ++++-- .../devauthservgetpkinfolist_fuzzer/BUILD.gn | 6 ++++-- .../devauthservgetregisterinfo_fuzzer/BUILD.gn | 6 ++++-- .../devauthservgetrelatedgroups_fuzzer/BUILD.gn | 6 ++++-- .../devauthservgettrusteddevices_fuzzer/BUILD.gn | 6 ++++-- .../devauthservisdeviceingroup_fuzzer/BUILD.gn | 6 ++++-- .../devauthservprocessauthdata_fuzzer/BUILD.gn | 6 ++++-- .../devauthservprocessbinddata_fuzzer/BUILD.gn | 6 ++++-- .../devauthservregcallback_fuzzer/BUILD.gn | 6 ++++-- .../BUILD.gn | 6 ++++-- .../devauthservunregcallback_fuzzer/BUILD.gn | 6 ++++-- .../BUILD.gn | 6 ++++-- .../groupoperationcommon_fuzzer/BUILD.gn | 14 ++++++++++---- test/unittest/deviceauth/BUILD.gn | 8 ++++++-- .../unit_test/services/creds_manager/BUILD.gn | 6 ++++-- .../frameworks/os_account_adapter/BUILD.gn | 6 ++++-- 34 files changed, 156 insertions(+), 71 deletions(-) diff --git a/test/fuzztest/authenticators/account_related/auth/isoauthtask_fuzzer/BUILD.gn b/test/fuzztest/authenticators/account_related/auth/isoauthtask_fuzzer/BUILD.gn index 98a0a251..f0a5ef53 100644 --- a/test/fuzztest/authenticators/account_related/auth/isoauthtask_fuzzer/BUILD.gn +++ b/test/fuzztest/authenticators/account_related/auth/isoauthtask_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -82,11 +82,15 @@ ohos_fuzztest("IsoAuthTaskFuzzTest") { "access_token:libaccesstoken_sdk", "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } + if (support_os_account) { external_deps += [ "ability_base:want", diff --git a/test/fuzztest/authenticators/account_unrelated/pake/standardexchangetask_fuzzer/BUILD.gn b/test/fuzztest/authenticators/account_unrelated/pake/standardexchangetask_fuzzer/BUILD.gn index 945eda6b..5ab8f825 100644 --- a/test/fuzztest/authenticators/account_unrelated/pake/standardexchangetask_fuzzer/BUILD.gn +++ b/test/fuzztest/authenticators/account_unrelated/pake/standardexchangetask_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -76,7 +76,6 @@ ohos_fuzztest("StandardExchangeTaskFuzzTest") { "access_token:libtoken_setproc", "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", @@ -84,6 +83,11 @@ ohos_fuzztest("StandardExchangeTaskFuzzTest") { "ipc:ipc_core", "samgr:samgr_proxy", ] + + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } + if (support_os_account) { external_deps += [ "ability_base:want", diff --git a/test/fuzztest/creds_manager/credsmanager_fuzzer/BUILD.gn b/test/fuzztest/creds_manager/credsmanager_fuzzer/BUILD.gn index a6472ab4..2b10c11f 100644 --- a/test/fuzztest/creds_manager/credsmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/creds_manager/credsmanager_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -54,8 +54,11 @@ ohos_fuzztest("CredsManagerFuzzTest") { sources += account_auth_plugin_mock_files sources += account_task_manager_mock_files } - sources -= soft_bus_channel_files - sources += soft_bus_channel_mock_files + + if (device_auth_enable_soft_bus_channel) { + sources -= soft_bus_channel_files + sources += soft_bus_channel_mock_files + } sources += identity_manager_files sources += [ "${key_management_adapter_path}/impl/src/common/mbedtls_ec_adapter.c", @@ -88,7 +91,6 @@ ohos_fuzztest("CredsManagerFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", @@ -96,6 +98,10 @@ ohos_fuzztest("CredsManagerFuzzTest") { "mbedtls:mbedtls_shared", "openssl:libcrypto_static", ] + + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/devauth_fuzzer/BUILD.gn b/test/fuzztest/devauth_fuzzer/BUILD.gn index 06bda007..06d26f04 100644 --- a/test/fuzztest/devauth_fuzzer/BUILD.gn +++ b/test/fuzztest/devauth_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -89,7 +89,6 @@ ohos_fuzztest("DevAuthFuzzTest") { "selinux_adapter:librestorecon", "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", @@ -97,6 +96,11 @@ ohos_fuzztest("DevAuthFuzzTest") { "ipc:ipc_core", "samgr:samgr_proxy", ] + + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } + if (support_os_account) { external_deps += [ "ability_base:want", diff --git a/test/fuzztest/devauthinterface_fuzzer/BUILD.gn b/test/fuzztest/devauthinterface_fuzzer/BUILD.gn index 9a89d591..258d2ae3 100644 --- a/test/fuzztest/devauthinterface_fuzzer/BUILD.gn +++ b/test/fuzztest/devauthinterface_fuzzer/BUILD.gn @@ -142,7 +142,6 @@ ohos_fuzztest("DevAuthInterfaceFuzzTest") { "bounds_checking_function:libsec_shared", "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", @@ -155,6 +154,9 @@ ohos_fuzztest("DevAuthInterfaceFuzzTest") { "common_event_service:cesfwk_innerkits", "safwk:system_ability_fwk", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservaddmembertogroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservaddmembertogroup_fuzzer/BUILD.gn index c4edc3ef..d55fec45 100644 --- a/test/fuzztest/device_auth_service/devauthservaddmembertogroup_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservaddmembertogroup_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -58,11 +58,13 @@ ohos_fuzztest("DevAuthServAddMemberToGroupFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservaddmultimemberstogroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservaddmultimemberstogroup_fuzzer/BUILD.gn index 84ac5491..510291fd 100644 --- a/test/fuzztest/device_auth_service/devauthservaddmultimemberstogroup_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservaddmultimemberstogroup_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,14 @@ ohos_fuzztest("DevAuthServAddMultiMembersToGroupFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservauthdevice_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservauthdevice_fuzzer/BUILD.gn index 46a46db3..e3c92bd1 100644 --- a/test/fuzztest/device_auth_service/devauthservauthdevice_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservauthdevice_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServAuthDeviceFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservcancelauthrequest_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservcancelauthrequest_fuzzer/BUILD.gn index 7c7a4f7d..237ac2fa 100644 --- a/test/fuzztest/device_auth_service/devauthservcancelauthrequest_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservcancelauthrequest_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServCancelAuthRequestFuzzTest") { external_deps = [ "cJSON:cjson_static", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservcancelbindrequest_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservcancelbindrequest_fuzzer/BUILD.gn index a261c5b8..60c4f9a0 100644 --- a/test/fuzztest/device_auth_service/devauthservcancelbindrequest_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservcancelbindrequest_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServCancelBindRequestFuzzTest") { external_deps = [ "cJSON:cjson_static", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservcheckaccesstogroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservcheckaccesstogroup_fuzzer/BUILD.gn index cffa2799..0c4c481d 100644 --- a/test/fuzztest/device_auth_service/devauthservcheckaccesstogroup_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservcheckaccesstogroup_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServCheckAccessToGroupFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservcreategroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservcreategroup_fuzzer/BUILD.gn index 8797b792..85309d93 100644 --- a/test/fuzztest/device_auth_service/devauthservcreategroup_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservcreategroup_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServCreateGroupFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservdeletegroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservdeletegroup_fuzzer/BUILD.gn index 26a44da9..5b3561fb 100644 --- a/test/fuzztest/device_auth_service/devauthservdeletegroup_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservdeletegroup_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServDeleteGroupFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservdeletememberfromgroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservdeletememberfromgroup_fuzzer/BUILD.gn index 6dc7d86c..34375003 100644 --- a/test/fuzztest/device_auth_service/devauthservdeletememberfromgroup_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservdeletememberfromgroup_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServDeleteMemberFromGroupFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservdeletemultimembersfromgroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservdeletemultimembersfromgroup_fuzzer/BUILD.gn index 87bfd47b..82caa984 100644 --- a/test/fuzztest/device_auth_service/devauthservdeletemultimembersfromgroup_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservdeletemultimembersfromgroup_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServDeleteMultiMembersFromGroupFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservgetdeviceinfobyid_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetdeviceinfobyid_fuzzer/BUILD.gn index 808db633..62312906 100644 --- a/test/fuzztest/device_auth_service/devauthservgetdeviceinfobyid_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservgetdeviceinfobyid_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServGetDeviceInfoByIdFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservgetgroupinfo_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetgroupinfo_fuzzer/BUILD.gn index 9bb23bd3..d0a41e2d 100644 --- a/test/fuzztest/device_auth_service/devauthservgetgroupinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservgetgroupinfo_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServGetGroupInfoFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservgetgroupinfobyid_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetgroupinfobyid_fuzzer/BUILD.gn index 442e0a30..7b412313 100644 --- a/test/fuzztest/device_auth_service/devauthservgetgroupinfobyid_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservgetgroupinfobyid_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServGetGroupInfoByIdFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservgetjoinedgroups_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetjoinedgroups_fuzzer/BUILD.gn index 2c1122ba..4fdc2d79 100644 --- a/test/fuzztest/device_auth_service/devauthservgetjoinedgroups_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservgetjoinedgroups_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServGetJoinedGroupsFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservgetpkinfolist_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetpkinfolist_fuzzer/BUILD.gn index 5b5cebf1..2b706058 100644 --- a/test/fuzztest/device_auth_service/devauthservgetpkinfolist_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservgetpkinfolist_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServGetPkInfoListFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservgetregisterinfo_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetregisterinfo_fuzzer/BUILD.gn index 0710cc36..0fc8da83 100644 --- a/test/fuzztest/device_auth_service/devauthservgetregisterinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservgetregisterinfo_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServGetRegisterInfoFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservgetrelatedgroups_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgetrelatedgroups_fuzzer/BUILD.gn index 6a4735cd..fa1785ec 100644 --- a/test/fuzztest/device_auth_service/devauthservgetrelatedgroups_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservgetrelatedgroups_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServGetRelatedGroupsFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservgettrusteddevices_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservgettrusteddevices_fuzzer/BUILD.gn index ad7908b3..5ea8e4f6 100644 --- a/test/fuzztest/device_auth_service/devauthservgettrusteddevices_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservgettrusteddevices_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServGetTrustedDevicesFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservisdeviceingroup_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservisdeviceingroup_fuzzer/BUILD.gn index 764273f3..4b3d9f33 100644 --- a/test/fuzztest/device_auth_service/devauthservisdeviceingroup_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservisdeviceingroup_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServIsDeviceInGroupFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservprocessauthdata_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservprocessauthdata_fuzzer/BUILD.gn index bccab43b..0b6ee1d3 100644 --- a/test/fuzztest/device_auth_service/devauthservprocessauthdata_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservprocessauthdata_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServProcessAuthDataFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservprocessbinddata_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservprocessbinddata_fuzzer/BUILD.gn index c8aaf8ed..5dca6c8d 100644 --- a/test/fuzztest/device_auth_service/devauthservprocessbinddata_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservprocessbinddata_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServProcessBindDataFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservregcallback_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservregcallback_fuzzer/BUILD.gn index 5dd805de..98fe2ec1 100644 --- a/test/fuzztest/device_auth_service/devauthservregcallback_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservregcallback_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServRegCallbackFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservregdatachangelistener_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservregdatachangelistener_fuzzer/BUILD.gn index 6591748a..0d45c0b1 100644 --- a/test/fuzztest/device_auth_service/devauthservregdatachangelistener_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservregdatachangelistener_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -60,11 +60,13 @@ ohos_fuzztest("DevAuthServRegDataChangeListenerFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservunregcallback_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservunregcallback_fuzzer/BUILD.gn index 1887f0d1..4dd580fb 100644 --- a/test/fuzztest/device_auth_service/devauthservunregcallback_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservunregcallback_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServUnregCallbackFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/device_auth_service/devauthservunregdatachangelistener_fuzzer/BUILD.gn b/test/fuzztest/device_auth_service/devauthservunregdatachangelistener_fuzzer/BUILD.gn index 36a810c0..1b41b9ef 100644 --- a/test/fuzztest/device_auth_service/devauthservunregdatachangelistener_fuzzer/BUILD.gn +++ b/test/fuzztest/device_auth_service/devauthservunregdatachangelistener_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -59,11 +59,13 @@ ohos_fuzztest("DevAuthServUnregDataChangeListenerFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ############################################################################### diff --git a/test/fuzztest/group_manage/groupoperationcommon_fuzzer/BUILD.gn b/test/fuzztest/group_manage/groupoperationcommon_fuzzer/BUILD.gn index 1481d41f..81880a6a 100644 --- a/test/fuzztest/group_manage/groupoperationcommon_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/groupoperationcommon_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -47,8 +47,10 @@ ohos_fuzztest("GroupOperationCommonFuzzTest") { sources += hal_common_files sources += hiview_adapter_files sources += identity_manager_files - sources -= soft_bus_channel_files - sources += soft_bus_channel_mock_files + if (device_auth_enable_soft_bus_channel) { + sources -= soft_bus_channel_files + sources += soft_bus_channel_mock_files + } if (support_os_account) { sources += account_subscriber_files sources += sa_subscriber_files @@ -83,7 +85,6 @@ ohos_fuzztest("GroupOperationCommonFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", @@ -91,6 +92,11 @@ ohos_fuzztest("GroupOperationCommonFuzzTest") { "mbedtls:mbedtls_shared", "openssl:libcrypto_static", ] + + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } + if (support_os_account) { external_deps += [ "ability_base:want", diff --git a/test/unittest/deviceauth/BUILD.gn b/test/unittest/deviceauth/BUILD.gn index 49b6a4b3..2ac899a3 100644 --- a/test/unittest/deviceauth/BUILD.gn +++ b/test/unittest/deviceauth/BUILD.gn @@ -534,7 +534,6 @@ ohos_unittest("device_auth_interface_test") { "bounds_checking_function:libsec_shared", "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", @@ -549,6 +548,9 @@ ohos_unittest("device_auth_interface_test") { "common_event_service:cesfwk_innerkits", "safwk:system_ability_fwk", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ohos_unittest("deviceauth_unit_test") { @@ -818,7 +820,6 @@ ohos_unittest("light_auth_test") { "bounds_checking_function:libsec_shared", "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", @@ -840,6 +841,9 @@ ohos_unittest("light_auth_test") { "googletest:gtest_main", "hilog:libhilog", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } ohos_unittest("identity_service_ipc_test") { diff --git a/test/unittest/tdd_framework/unit_test/services/creds_manager/BUILD.gn b/test/unittest/tdd_framework/unit_test/services/creds_manager/BUILD.gn index 6907bdb4..a7f14530 100644 --- a/test/unittest/tdd_framework/unit_test/services/creds_manager/BUILD.gn +++ b/test/unittest/tdd_framework/unit_test/services/creds_manager/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2023 Huawei Device Co., Ltd. +# Copyright (C) 2023-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -81,7 +81,6 @@ ohos_unittest("creds_manager_test") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "dsoftbus:softbus_client", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", @@ -91,4 +90,7 @@ ohos_unittest("creds_manager_test") { "mbedtls:mbedtls_shared", "openssl:libcrypto_static", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } diff --git a/test/unittest/tdd_framework/unit_test/services/frameworks/os_account_adapter/BUILD.gn b/test/unittest/tdd_framework/unit_test/services/frameworks/os_account_adapter/BUILD.gn index 0e9db739..f988bcd5 100644 --- a/test/unittest/tdd_framework/unit_test/services/frameworks/os_account_adapter/BUILD.gn +++ b/test/unittest/tdd_framework/unit_test/services/frameworks/os_account_adapter/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2023 Huawei Device Co., Ltd. +# Copyright (C) 2023-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -96,7 +96,6 @@ if (support_os_account) { "cJSON:cjson", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "dsoftbus:softbus_client", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", @@ -111,6 +110,9 @@ if (support_os_account) { "os_account:os_account_innerkits", "samgr:samgr_proxy", ] + if (device_auth_enable_soft_bus_channel) { + external_deps += [ "dsoftbus:softbus_client" ] + } } } -- Gitee