From 497d4547cec8697b216ebce9ab92ff8f24c3e2b1 Mon Sep 17 00:00:00 2001 From: wangxin617 Date: Wed, 14 Aug 2024 11:22:52 +0800 Subject: [PATCH] Modify the third-party component dependency absolute path Signed-off-by: wangxin617 --- core/common/dfx/hidumper_adapter/BUILD.gn | 1 - .../fuzztest/softbusbroadcast_fuzzer/BUILD.gn | 6 +- tests/adapter/unittest/BUILD.gn | 155 ++++++------------ tests/core/adapter/BUILD.gn | 7 +- .../fuzztest/softbusrsacrypto_fuzzer/BUILD.gn | 3 +- .../fuzztest/jsonutils_fuzzer/BUILD.gn | 13 +- tests/core/common/json_utils/uttest/BUILD.gn | 11 +- .../fuzztest/messagehandler_fuzzer/BUILD.gn | 1 - tests/core/common/queue/BUILD.gn | 7 +- .../security/permission/common/BUILD.gn | 19 +-- .../security/permission/standard/BUILD.gn | 20 +-- tests/core/common/utils/BUILD.gn | 20 +-- .../utils/permission_state_test/BUILD.gn | 4 +- .../coap/nstackx_adapter_mock/BUILD.gn | 18 +- .../core/discovery/manager/unittest/BUILD.gn | 5 +- tests/sdk/discovery/benchmarktest/BUILD.gn | 14 +- .../fuzztest/discoveryservice_fuzzer/BUILD.gn | 15 +- 17 files changed, 97 insertions(+), 222 deletions(-) diff --git a/core/common/dfx/hidumper_adapter/BUILD.gn b/core/common/dfx/hidumper_adapter/BUILD.gn index 80a4225dd..bcb22231d 100644 --- a/core/common/dfx/hidumper_adapter/BUILD.gn +++ b/core/common/dfx/hidumper_adapter/BUILD.gn @@ -43,7 +43,6 @@ if (defined(ohos_lite)) { "$dsoftbus_root_path/core/transmission/common/include", "$dsoftbus_root_path/interfaces/kits/transport", "$hilog_lite_include_path", - "//third_party/cJSON", ] sources = [ "softbus_hidumper.c", diff --git a/tests/adapter/fuzztest/softbusbroadcast_fuzzer/BUILD.gn b/tests/adapter/fuzztest/softbusbroadcast_fuzzer/BUILD.gn index 5bc69e500..b02623bd3 100644 --- a/tests/adapter/fuzztest/softbusbroadcast_fuzzer/BUILD.gn +++ b/tests/adapter/fuzztest/softbusbroadcast_fuzzer/BUILD.gn @@ -38,7 +38,6 @@ ohos_fuzztest("SoftBusBroadcastFuzzTest") { "$dsoftbus_root_path/adapter/common/net/bluetooth/broadcast/adapter/include", "$dsoftbus_root_path/adapter/common/net/bluetooth/broadcast/adapter/ble/include", "$dsoftbus_root_path/core/common/dfx/hidumper_adapter/include", - "//foundation/communication/bluetooth/interfaces/inner_api/include", ] deps = [ @@ -46,7 +45,10 @@ ohos_fuzztest("SoftBusBroadcastFuzzTest") { "$dsoftbus_root_path/core/frame:softbus_server", ] - external_deps = [ "hilog:libhilog" ] + external_deps = [ + "bluetooth:btframework", + "hilog:libhilog", + ] cflags = [ "-g", diff --git a/tests/adapter/unittest/BUILD.gn b/tests/adapter/unittest/BUILD.gn index 13cf64007..0c346b897 100644 --- a/tests/adapter/unittest/BUILD.gn +++ b/tests/adapter/unittest/BUILD.gn @@ -37,14 +37,14 @@ if (defined(ohos_lite)) { "$dsoftbus_root_path/core/common/dfx/interface/include", "$dsoftbus_root_path/interfaces/kits/common", "$hilog_lite_include_path", - "//third_party/bounds_checking_function/include", ] deps = [ "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common/dfx/log:softbus_dfx_log", "$hilog_lite_deps_path", - "//third_party/bounds_checking_function:libsec_static", ] + + external_deps = [ "bounds_checking_function:libsec_static" ] } } } else { @@ -64,7 +64,6 @@ if (defined(ohos_lite)) { deps = [ "../../../adapter:softbus_adapter" ] external_deps = [ "bounds_checking_function:libsec_static", - "c_utils:utils", "hilog:libhilog", ] } @@ -76,24 +75,14 @@ if (defined(ohos_lite)) { "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include/", "$dsoftbus_root_path/interfaces/kits/common", - "//third_party/bounds_checking_function/include", ] - deps = [ - "../../../adapter:softbus_adapter", - "//third_party/bounds_checking_function:libsec_static", - "//third_party/googletest:gtest_main", + deps = [ "$dsoftbus_root_path/adapter:softbus_adapter" ] + + external_deps = [ + "bounds_checking_function:libsec_static", + "googletest:gtest_main", + "hilog:libhilog", ] - if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } } ohos_unittest("AdapterDsoftbusDfxTest") { @@ -103,24 +92,14 @@ if (defined(ohos_lite)) { "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include/", "$dsoftbus_root_path/interfaces/kits/common", - "//third_party/bounds_checking_function/include", ] - deps = [ - "../../../adapter:softbus_adapter", - "//third_party/bounds_checking_function:libsec_static", - "//third_party/googletest:gtest_main", + deps = [ "$dsoftbus_root_path/adapter:softbus_adapter" ] + + external_deps = [ + "bounds_checking_function:libsec_static", + "googletest:gtest_main", + "hilog:libhilog", ] - if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } } ohos_unittest("AdapterDsoftbusOtherTest") { @@ -130,24 +109,14 @@ if (defined(ohos_lite)) { "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include/", "$dsoftbus_root_path/interfaces/kits/common", - "//third_party/bounds_checking_function/include", ] - deps = [ - "../../../adapter:softbus_adapter", - "//third_party/bounds_checking_function:libsec_static", - "//third_party/googletest:gtest_main", + deps = [ "$dsoftbus_root_path/adapter:softbus_adapter" ] + + external_deps = [ + "bounds_checking_function:libsec_static", + "googletest:gtest_main", + "hilog:libhilog", ] - if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } } ohos_unittest("AdapterDsoftbusRangeTest") { @@ -158,10 +127,9 @@ if (defined(ohos_lite)) { "$dsoftbus_root_path/core/common/include/", "$dsoftbus_root_path/interfaces/kits/common", ] - deps = [ "../../../adapter:softbus_adapter" ] + deps = [ "$dsoftbus_root_path/adapter:softbus_adapter" ] external_deps = [ "bounds_checking_function:libsec_static", - "c_utils:utils", "googletest:gtest_main", "hilog:libhilog", ] @@ -174,24 +142,14 @@ if (defined(ohos_lite)) { "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include/", "$dsoftbus_root_path/interfaces/kits/common", - "//third_party/bounds_checking_function/include", ] - deps = [ - "../../../adapter:softbus_adapter", - "//third_party/bounds_checking_function:libsec_static", - "//third_party/googletest:gtest_main", + deps = [ "$dsoftbus_root_path/adapter:softbus_adapter" ] + + external_deps = [ + "bounds_checking_function:libsec_static", + "googletest:gtest_main", + "hilog:libhilog", ] - if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } } ohos_unittest("SoftbusThreadTest") { @@ -205,7 +163,6 @@ if (defined(ohos_lite)) { deps = [ "../../../adapter:softbus_adapter" ] external_deps = [ "bounds_checking_function:libsec_static", - "c_utils:utils", "googletest:gtest_main", "hilog:libhilog", ] @@ -219,10 +176,9 @@ if (defined(ohos_lite)) { "$dsoftbus_root_path/interfaces/kits/common", "$dsoftbus_root_path/core/common/include/", ] - deps = [ "../../../adapter:softbus_adapter" ] + deps = [ "$dsoftbus_root_path/adapter:softbus_adapter" ] external_deps = [ - "c_utils:utils", "googletest:gtest_main", "hilog:libhilog", ] @@ -236,11 +192,8 @@ if (defined(ohos_lite)) { "$dsoftbus_root_path/interfaces/kits/common", "$dsoftbus_root_path/core/common/include/", ] - deps = [ "../../../adapter:softbus_adapter" ] - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] + deps = [ "$dsoftbus_root_path/adapter:softbus_adapter" ] + external_deps = [ "hilog:libhilog" ] } ohos_unittest("AdapterDsoftbusWifiTest") { @@ -269,21 +222,21 @@ if (defined(ohos_lite)) { "$dsoftbus_root_path/core/common/dfx/interface/include", ] deps = [ + "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/common/dfx/log:softbus_dfx_log", - "../../../adapter:softbus_adapter", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", ] if (is_standard_system) { external_deps = [ - "c_utils:utils", + "googletest:gmock", + "googletest:gtest_main", "hilog:libhilog", "wifi:wifi_sdk", ] } else { external_deps = [ - "c_utils:utils", + "googletest:gmock", + "googletest:gtest_main", "hilog:libhilog", ] } @@ -322,21 +275,13 @@ if (defined(ohos_lite)) { ] deps = [ "$dsoftbus_root_path/core/common:softbus_utils", - "//foundation/communication/dsoftbus/core/common/dfx/log:softbus_dfx_log", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", + "$dsoftbus_root_path/core/common/dfx/log:softbus_dfx_log", + ] + external_deps = [ + "googletest:gmock", + "googletest:gtest_main", + "hilog:libhilog", ] - if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } } ohos_unittest("AdapterWlanExtendTest") { @@ -351,22 +296,14 @@ if (defined(ohos_lite)) { "$dsoftbus_root_path/core/common/dfx/interface/include", ] deps = [ + "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common/dfx/log:softbus_dfx_log", "$dsoftbus_root_path/core/frame:softbus_server", - "../../../adapter:softbus_adapter", - "//third_party/googletest:gtest_main", ] - if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } + external_deps = [ + "googletest:gtest_main", + "hilog:libhilog", + ] } group("unittest") { diff --git a/tests/core/adapter/BUILD.gn b/tests/core/adapter/BUILD.gn index 3e1b207f0..ee171d84e 100644 --- a/tests/core/adapter/BUILD.gn +++ b/tests/core/adapter/BUILD.gn @@ -67,16 +67,15 @@ ohos_unittest("AdapterDsoftbusRsaCryptoTest") { "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", - "//third_party/bounds_checking_function:libsec_static", - "//third_party/googletest:gtest_main", ] if (is_standard_system) { - deps += [ "//third_party/openssl:libcrypto_shared" ] external_deps = [ - "c_utils:utils", + "bounds_checking_function:libsec_static", + "googletest:gtest_main", "hilog:libhilog", "huks:libhukssdk", + "openssl:libcrypto_shared", ] } else { external_deps = [ diff --git a/tests/core/adapter/fuzztest/softbusrsacrypto_fuzzer/BUILD.gn b/tests/core/adapter/fuzztest/softbusrsacrypto_fuzzer/BUILD.gn index e938b6361..d629f86f4 100755 --- a/tests/core/adapter/fuzztest/softbusrsacrypto_fuzzer/BUILD.gn +++ b/tests/core/adapter/fuzztest/softbusrsacrypto_fuzzer/BUILD.gn @@ -42,11 +42,10 @@ ohos_fuzztest("SoftBusRsaCryptoFuzzTest") { ] if (is_standard_system) { - deps += [ "//third_party/openssl:libcrypto_shared" ] external_deps = [ - "c_utils:utils", "hilog:libhilog", "huks:libhukssdk", + "openssl:libcrypto_shared", ] } else { external_deps = [ diff --git a/tests/core/common/json_utils/fuzztest/jsonutils_fuzzer/BUILD.gn b/tests/core/common/json_utils/fuzztest/jsonutils_fuzzer/BUILD.gn index 9ab51c54a..57f074884 100644 --- a/tests/core/common/json_utils/fuzztest/jsonutils_fuzzer/BUILD.gn +++ b/tests/core/common/json_utils/fuzztest/jsonutils_fuzzer/BUILD.gn @@ -27,7 +27,6 @@ ohos_fuzztest("JsonUtilsFuzzTest") { include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", - "//commonlibrary/c_utils/base/include", ] cflags = [ "-g", @@ -44,15 +43,5 @@ ohos_fuzztest("JsonUtilsFuzzTest") { "$dsoftbus_root_path/core/frame:softbus_server", ] - if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } + external_deps = [ "hilog:libhilog" ] } diff --git a/tests/core/common/json_utils/uttest/BUILD.gn b/tests/core/common/json_utils/uttest/BUILD.gn index c5083cbc5..7495e0605 100644 --- a/tests/core/common/json_utils/uttest/BUILD.gn +++ b/tests/core/common/json_utils/uttest/BUILD.gn @@ -28,17 +28,14 @@ ohos_unittest("SoftbusJsonUtilsTest") { "$dsoftbus_root_path/interfaces/kits/common", "$dsoftbus_root_path/core/common/dfx/interface/include", "$dsoftbus_root_path/adapter/common/include", - "//third_party/cJSON", ] - deps = [ - "$dsoftbus_root_path/core/common:softbus_utils", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", - ] + deps = [ "$dsoftbus_root_path/core/common:softbus_utils" ] external_deps = [ - "c_utils:utils", + "cJSON:cjson", + "googletest:gmock", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", ] diff --git a/tests/core/common/message_handler/fuzztest/messagehandler_fuzzer/BUILD.gn b/tests/core/common/message_handler/fuzztest/messagehandler_fuzzer/BUILD.gn index bd65cc737..05398ddee 100644 --- a/tests/core/common/message_handler/fuzztest/messagehandler_fuzzer/BUILD.gn +++ b/tests/core/common/message_handler/fuzztest/messagehandler_fuzzer/BUILD.gn @@ -27,7 +27,6 @@ ohos_fuzztest("MessageHandlerFuzzTest") { include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", - "//commonlibrary/c_utils/base/include", ] cflags = [ "-g", diff --git a/tests/core/common/queue/BUILD.gn b/tests/core/common/queue/BUILD.gn index 3debb88f3..8cf8adade 100755 --- a/tests/core/common/queue/BUILD.gn +++ b/tests/core/common/queue/BUILD.gn @@ -31,13 +31,10 @@ ohos_unittest("CommonCoreQueueTest") { "$dsoftbus_root_path/core/common/include", ] - deps = [ - "$dsoftbus_root_path/core/common:softbus_utils", - "//third_party/googletest:gtest_main", - ] + deps = [ "$dsoftbus_root_path/core/common:softbus_utils" ] external_deps = [ - "c_utils:utils", + "googletest:gtest_main", "hilog:libhilog", ] } diff --git a/tests/core/common/security/permission/common/BUILD.gn b/tests/core/common/security/permission/common/BUILD.gn index 5b732445b..0a1590665 100644 --- a/tests/core/common/security/permission/common/BUILD.gn +++ b/tests/core/common/security/permission/common/BUILD.gn @@ -32,11 +32,10 @@ ohos_unittest("PermissionEntryTest") { "$dsoftbus_root_path/core/frame:softbus_server", "$dsoftbus_root_path/sdk:softbus_client", "$dsoftbus_root_path/tests/sdk/common:softbus_access_token_test", - "//third_party/googletest:gtest_main", ] if (is_standard_system) { external_deps = [ - "c_utils:utils", + "googletest:gtest_main", "hilog:libhilog", ] } else { @@ -63,19 +62,11 @@ ohos_unittest("PermissionEntryStaticTest") { "$dsoftbus_root_path/core/frame:softbus_server", "$dsoftbus_root_path/sdk:softbus_client", "$dsoftbus_root_path/tests/sdk/common:softbus_access_token_test", - "//third_party/googletest:gtest_main", ] - if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } + external_deps = [ + "googletest:gtest_main", + "hilog:libhilog", + ] } group("unittest") { diff --git a/tests/core/common/security/permission/standard/BUILD.gn b/tests/core/common/security/permission/standard/BUILD.gn index dfea0b30c..0220e40cb 100644 --- a/tests/core/common/security/permission/standard/BUILD.gn +++ b/tests/core/common/security/permission/standard/BUILD.gn @@ -32,19 +32,11 @@ ohos_unittest("SoftbusPermissionTest") { "$dsoftbus_root_path/core/frame:softbus_server", "$dsoftbus_root_path/sdk:softbus_client", "$dsoftbus_root_path/tests/sdk/common:softbus_access_token_test", - "//third_party/googletest:gtest_main", ] - if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } + external_deps = [ + "googletest:gtest_main", + "hilog:libhilog", + ] } ohos_unittest("SoftbusPermissionACLTest") { @@ -66,13 +58,12 @@ ohos_unittest("SoftbusPermissionACLTest") { "$dsoftbus_root_path/core/frame:softbus_server", "$dsoftbus_root_path/sdk:softbus_client", "$dsoftbus_root_path/tests/sdk/common:softbus_access_token_test", - "//third_party/googletest:gtest_main", ] if (is_standard_system) { external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libtoken_setproc", - "c_utils:utils", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", @@ -84,6 +75,7 @@ ohos_unittest("SoftbusPermissionACLTest") { } else { external_deps = [ "c_utils:utils", + "googletest:gtest_main", "hilog:libhilog", ] } diff --git a/tests/core/common/utils/BUILD.gn b/tests/core/common/utils/BUILD.gn index 64b7960f0..03568c920 100644 --- a/tests/core/common/utils/BUILD.gn +++ b/tests/core/common/utils/BUILD.gn @@ -52,27 +52,17 @@ if (defined(ohos_lite)) { "$dsoftbus_root_path/core/common/include", "$dsoftbus_root_path/interfaces/kits/bus_center", "$dsoftbus_root_path/interfaces/kits/common", - "//commonlibrary/c_utils/base/include", ] deps = [ "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", - "//third_party/googletest:gtest_main", - "//third_party/sqlite:sqlite", ] - - if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } + external_deps = [ + "googletest:gtest_main", + "hilog:libhilog", + "sqlite:sqlite", + ] } group("unittest") { diff --git a/tests/core/common/utils/permission_state_test/BUILD.gn b/tests/core/common/utils/permission_state_test/BUILD.gn index 5d3eef6ef..f71063627 100644 --- a/tests/core/common/utils/permission_state_test/BUILD.gn +++ b/tests/core/common/utils/permission_state_test/BUILD.gn @@ -32,21 +32,21 @@ ohos_unittest("PermissionStateTest") { "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", - "//third_party/googletest:gtest_main", ] if (is_standard_system) { external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libprivacy_sdk", - "c_utils:utils", "device_auth:deviceauth_sdk", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", ] } else { external_deps = [ "c_utils:utils", + "googletest:gtest_main", "hilog:libhilog", ] } diff --git a/tests/core/discovery/coap/nstackx_adapter_mock/BUILD.gn b/tests/core/discovery/coap/nstackx_adapter_mock/BUILD.gn index bef2fddd1..6737ad14f 100644 --- a/tests/core/discovery/coap/nstackx_adapter_mock/BUILD.gn +++ b/tests/core/discovery/coap/nstackx_adapter_mock/BUILD.gn @@ -55,21 +55,13 @@ ohos_unittest("NstackxAdapterTest") { "$dsoftbus_root_path/components/nstackx/nstackx_ctrl:nstackx_ctrl", "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", ] - if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - } + external_deps = [ + "googletest:gmock", + "googletest:gtest_main", + "hilog:libhilog", + ] } group("unittest") { diff --git a/tests/core/discovery/manager/unittest/BUILD.gn b/tests/core/discovery/manager/unittest/BUILD.gn index 458c5b59d..9d0f48585 100644 --- a/tests/core/discovery/manager/unittest/BUILD.gn +++ b/tests/core/discovery/manager/unittest/BUILD.gn @@ -109,12 +109,11 @@ ohos_unittest("DiscManagerServerTest") { deps = [ "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", ] external_deps = [ - "c_utils:utils", + "googletest:gmock", + "googletest:gtest_main", "hilog:libhilog", ] } diff --git a/tests/sdk/discovery/benchmarktest/BUILD.gn b/tests/sdk/discovery/benchmarktest/BUILD.gn index b9f1ded63..37e9f38f5 100644 --- a/tests/sdk/discovery/benchmarktest/BUILD.gn +++ b/tests/sdk/discovery/benchmarktest/BUILD.gn @@ -25,19 +25,13 @@ ohos_benchmarktest("DiscoveryTest") { "$dsoftbus_root_path/interfaces/kits/common", "$dsoftbus_root_path/sdk/discovery/include", "$dsoftbus_root_path/sdk/discovery/manager/include", - "//base/security/access_token/interfaces/innerkits/token_setproc/include", - "//base/security/access_token/interfaces/innerkits/nativetoken/include", - "//base/security/access_token/interfaces/innerkits/accesstoken/include", - ] - deps = [ - "../../../../sdk:softbus_client", - "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken", - "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", ] + deps = [ "$dsoftbus_root_path/sdk:softbus_client" ] external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", "bounds_checking_function:libsec_static", - "c_utils:utils", "googletest:gtest_main", ] } diff --git a/tests/sdk/discovery/fuzztest/discoveryservice_fuzzer/BUILD.gn b/tests/sdk/discovery/fuzztest/discoveryservice_fuzzer/BUILD.gn index 655cfa20f..e90675772 100644 --- a/tests/sdk/discovery/fuzztest/discoveryservice_fuzzer/BUILD.gn +++ b/tests/sdk/discovery/fuzztest/discoveryservice_fuzzer/BUILD.gn @@ -26,14 +26,13 @@ ohos_fuzztest("DiscoveryServiceFuzzTest") { fuzz_config_file = "$dsoftbus_root_path/tests/sdk/discovery/fuzztest/discoveryservice_fuzzer" include_dirs = [ - "../../../../../adapter/common/include", - "../../../../../core/common/include", - "../../../../../core/common/inner_communication", - "../../../../../interfaces/kits/common", - "../../../../../interfaces/kits/discovery", - "../../../../../sdk/discovery/include", - "../../../../../sdk/discovery/manager/include", - "//commonlibrary/c_utils/base/include", + "$dsoftbus_root_path/adapter/common/include", + "$dsoftbus_root_path/core/common/include", + "$dsoftbus_root_path/core/common/inner_communication", + "$dsoftbus_root_path/interfaces/kits/common", + "$dsoftbus_root_path/interfaces/kits/discovery", + "$dsoftbus_root_path/sdk/discovery/include", + "$dsoftbus_root_path/sdk/discovery/manager/include", ] cflags = [ "-g",