diff --git a/BUILD.gn b/BUILD.gn index d2b403610..bab7538bf 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("dsoftbus.gni") lite_component("dsoftbus") { features = [ diff --git a/adapter/BUILD.gn b/adapter/BUILD.gn index 4214fc912..979454fb0 100644 --- a/adapter/BUILD.gn +++ b/adapter/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../dsoftbus.gni") if (defined(ohos_lite)) { import("//build/lite/config/component/lite_component.gni") diff --git a/bundle.json b/bundle.json index 8f432e83d..36fb2f150 100644 --- a/bundle.json +++ b/bundle.json @@ -1,17 +1,18 @@ { "name": "@openharmony/dsoftbus", - "version": "3.1.0", + "version": "4.0", "description": "dsoftbus", "publishAs": "code-segment", + "segment": { + "destPath": "foundation/communication/dsoftbus" + }, + "dirs": {}, "scripts": { "install": "DEST_PATH=${DEP_BUNDLE_BASE}/foundation/communication/dsoftbus && mkdir -p $DEST_PATH && cp -r ./* $DEST_PATH" }, "author": {}, "repository": "", "license": "Apache License 2.0", - "segment": { - "destPath": "foundation/communication/dsoftbus" - }, "component": { "name": "dsoftbus", "subsystem": "communication", @@ -39,8 +40,8 @@ "dsoftbus_standard_feature_dfinder_support_multi_nif", "dsoftbus_feature_protocol_newip" ], - "rom": "967KB", - "ram": "28MB", + "rom": "3000KB", + "ram": "40MB", "deps": { "components": [ "ability_base", diff --git a/core/BUILD.gn b/core/BUILD.gn index 1229eab92..0e933cf18 100644 --- a/core/BUILD.gn +++ b/core/BUILD.gn @@ -11,14 +11,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../dsoftbus.gni") if (defined(ohos_lite)) { lite_component("softbus_server") { if (ohos_kernel_type == "liteos_m") { features = [ "frame:softbus_server_frame", - "$dsoftbus_root_path/core/common:softbus_utils", + "common:softbus_utils", "$dsoftbus_root_path/adapter:softbus_adapter", ] } else { diff --git a/core/common/BUILD.gn b/core/common/BUILD.gn index b1c4e7fb3..ebb7f2fec 100644 --- a/core/common/BUILD.gn +++ b/core/common/BUILD.gn @@ -11,11 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -import( - "//foundation/communication/dsoftbus/core/connection/common/conn_common.gni") -import( - "//foundation/communication/dsoftbus/core/transmission/common/trans_common.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../dsoftbus.gni") +import("../connection/common/conn_common.gni") +import("../transmission/common/trans_common.gni") common_utils_src = [ "bitmap/softbus_bitmap.c", diff --git a/core/frame/BUILD.gn b/core/frame/BUILD.gn index 79f2b0747..28a31584c 100644 --- a/core/frame/BUILD.gn +++ b/core/frame/BUILD.gn @@ -11,17 +11,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/communication/dsoftbus/core/adapter/core_adapter.gni") -import( - "//foundation/communication/dsoftbus/core/authentication/authentication.gni") -import( - "//foundation/communication/dsoftbus/core/bus_center/bus_center_server.gni") -import( - "//foundation/communication/dsoftbus/core/common/security/permission/permission.gni") -import("//foundation/communication/dsoftbus/core/connection/conn.gni") -import("//foundation/communication/dsoftbus/core/discovery/disc.gni") -import("//foundation/communication/dsoftbus/core/transmission/trans.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../dsoftbus.gni") +import("../adapter/core_adapter.gni") +import("../authentication/authentication.gni") +import("../bus_center/bus_center_server.gni") +import("../common/security/permission/permission.gni") +import("../connection/conn.gni") +import("../discovery/disc.gni") +import("../transmission/trans.gni") dsoftbus_server_common_src = auth_server_src + bus_center_server_src + conn_manager_src + diff --git a/dsoftbus.gni b/dsoftbus.gni index 9bcc8f57f..c9c4c2e1d 100644 --- a/dsoftbus.gni +++ b/dsoftbus.gni @@ -11,23 +11,22 @@ # See the License for the specific language governing permissions and # limitations under the License. +ability_base_path = "//foundation/ability/ability_base" ability_runtime_path = "//foundation/ability/ability_runtime" ability_runtime_inner_api_path = "${ability_runtime_path}/interfaces/inner_api" ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits" ability_runtime_services_path = "${ability_runtime_path}/services" hispark_pegasus_sdk_path = "//device/soc/hisilicon/hi3861v100/sdk_liteos" dsoftbus_root_path = "//foundation/communication/dsoftbus" -dsoftbus_sdk_path = "//foundation/communication/dsoftbus/sdk" -dsoftbus_core_path = "//foundation/communication/dsoftbus/core" -ability_base_path = "//foundation/ability/ability_base" -dsoftbus_test_path = "//foundation/communication/dsoftbus/tests" +dsoftbus_sdk_path = "${dsoftbus_root_path}/sdk" +dsoftbus_core_path = "${dsoftbus_root_path}/core" +dsoftbus_test_path = "${dsoftbus_root_path}/tests" declare_args() { - softbus_adapter_common = "//foundation/communication/dsoftbus/adapter/common" - softbus_adapter_config = - "//foundation/communication/dsoftbus/adapter/default_config" + softbus_adapter_common = "${dsoftbus_root_path}/adapter/common" + softbus_adapter_config = "${dsoftbus_root_path}/adapter/default_config" dsoftbus_feature_product_config_path = - "//foundation/communication/dsoftbus/adapter/default_config" + "${dsoftbus_root_path}/adapter/default_config" } declare_args() { diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index 838ef0547..141783387 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -11,12 +11,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/communication/dsoftbus/dsoftbus.gni") - -import("//foundation/communication/dsoftbus/sdk/bus_center/bus_center_sdk.gni") -import("//foundation/communication/dsoftbus/sdk/discovery/disc_sdk.gni") -import("//foundation/communication/dsoftbus/sdk/frame/frame_sdk.gni") -import("//foundation/communication/dsoftbus/sdk/transmission/trans_sdk.gni") +import("../dsoftbus.gni") +import("bus_center/bus_center_sdk.gni") +import("discovery/disc_sdk.gni") +import("frame/frame_sdk.gni") +import("transmission/trans_sdk.gni") common_client_src = bus_center_sdk_src + disc_sdk_src + softbus_client_frame_src + trans_session_manager_sdk_src diff --git a/tests/adapter/BUILD.gn b/tests/adapter/BUILD.gn index 24828814a..b9db13dff 100644 --- a/tests/adapter/BUILD.gn +++ b/tests/adapter/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../dsoftbus.gni") group("unittest") { testonly = true diff --git a/tests/adapter/bluetooth/BUILD.gn b/tests/adapter/bluetooth/BUILD.gn index d6e69527e..e1abcf017 100644 --- a/tests/adapter/bluetooth/BUILD.gn +++ b/tests/adapter/bluetooth/BUILD.gn @@ -14,9 +14,8 @@ import("//build/lite/config/component/lite_component.gni") import("//build/ohos.gni") import("//build/test.gni") -import( - "//foundation/communication/dsoftbus/adapter/common/net/bluetooth/net_bluetooth.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../adapter/common/net/bluetooth/net_bluetooth.gni") +import("../../../dsoftbus.gni") module_output_path = "dsoftbus/adapter" @@ -27,9 +26,7 @@ ohos_unittest("AdapterBleGattTest") { "softbus_adapter_ble_gatt_test.cpp", ] - include_dirs = [ - "//foundation/communication/dsoftbus/adapter/common/net/bluetooth/include", - ] + include_dirs = [ "../../../adapter/common/net/bluetooth/include" ] deps = [ "$dsoftbus_root_path/core/common:softbus_utils", @@ -56,9 +53,7 @@ ohos_unittest("AdapterBleGattServerTest") { "softbus_adapter_ble_gatt_server_test.cpp", ] - include_dirs = [ - "//foundation/communication/dsoftbus/adapter/common/net/bluetooth/include", - ] + include_dirs = [ "../../../adapter/common/net/bluetooth/include" ] deps = [ "$dsoftbus_root_path/core/common:softbus_utils", @@ -85,9 +80,7 @@ ohos_unittest("AdapterBleGattClientTest") { "softbus_adapter_ble_gatt_client_test.cpp", ] - include_dirs = [ - "//foundation/communication/dsoftbus/adapter/common/net/bluetooth/include", - ] + include_dirs = [ "../../../adapter/common/net/bluetooth/include" ] deps = [ "$dsoftbus_root_path/core/common:softbus_utils", @@ -111,9 +104,7 @@ ohos_unittest("AdapterBtUtilsTest") { module_out_path = module_output_path sources = [ "adapter_bt_utils_test.cpp" ] - include_dirs = [ - "//foundation/communication/dsoftbus/adapter/common/net/bluetooth/include", - ] + include_dirs = [ "../../../adapter/common/net/bluetooth/include" ] deps = [ "$dsoftbus_root_path/core/common:softbus_utils", @@ -140,9 +131,7 @@ ohos_unittest("AdapterBtCommonTest") { "softbus_adapter_bt_common_test.cpp", ] - include_dirs = [ - "//foundation/communication/dsoftbus/adapter/common/net/bluetooth/include", - ] + include_dirs = [ "../../../adapter/common/net/bluetooth/include" ] deps = [ "$dsoftbus_root_path/core/common:softbus_utils", diff --git a/tests/adapter/fuzztest/softbusadapterhisysevent_fuzzer/BUILD.gn b/tests/adapter/fuzztest/softbusadapterhisysevent_fuzzer/BUILD.gn index 41d0cfb61..ee12b7fc5 100644 --- a/tests/adapter/fuzztest/softbusadapterhisysevent_fuzzer/BUILD.gn +++ b/tests/adapter/fuzztest/softbusadapterhisysevent_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("SoftBusAdapterHiSysEventFuzzTest") { diff --git a/tests/adapter/fuzztest/softbusadapterrange_fuzzer/BUILD.gn b/tests/adapter/fuzztest/softbusadapterrange_fuzzer/BUILD.gn index 4df8c1060..5ed926654 100644 --- a/tests/adapter/fuzztest/softbusadapterrange_fuzzer/BUILD.gn +++ b/tests/adapter/fuzztest/softbusadapterrange_fuzzer/BUILD.gn @@ -13,12 +13,13 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("SoftBusAdapterRangeFuzzTest") { module_out_path = "dsoftbus/adapter" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/adapter/fuzztest/softbusadapterrange_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/adapter/fuzztest/softbusadapterrange_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include" ] cflags = [ "-g", @@ -29,7 +30,7 @@ ohos_fuzztest("SoftBusAdapterRangeFuzzTest") { ] sources = [ "softbusadapterrange_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/adapter:softbus_adapter" ] + deps = [ "../../../../adapter:softbus_adapter" ] external_deps = [ "c_utils:utils", diff --git a/tests/adapter/fuzztest/softbusdecryptdata_fuzzer/BUILD.gn b/tests/adapter/fuzztest/softbusdecryptdata_fuzzer/BUILD.gn index 6c86df994..7f381fa89 100644 --- a/tests/adapter/fuzztest/softbusdecryptdata_fuzzer/BUILD.gn +++ b/tests/adapter/fuzztest/softbusdecryptdata_fuzzer/BUILD.gn @@ -13,13 +13,14 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/adapter" ##############################fuzztest########################################## ohos_fuzztest("SoftBusDecryptDataFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/adapter/fuzztest/softbusdecryptdata_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/adapter/fuzztest/softbusdecryptdata_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include" ] cflags = [ "-g", @@ -30,7 +31,7 @@ ohos_fuzztest("SoftBusDecryptDataFuzzTest") { ] sources = [ "softbusdecryptdata_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/adapter:softbus_adapter" ] + deps = [ "../../../../adapter:softbus_adapter" ] external_deps = [ "c_utils:utils", diff --git a/tests/adapter/unittest/BUILD.gn b/tests/adapter/unittest/BUILD.gn index 7504e3c6a..90ded52c0 100644 --- a/tests/adapter/unittest/BUILD.gn +++ b/tests/adapter/unittest/BUILD.gn @@ -15,7 +15,7 @@ defines = [] if (defined(ohos_lite)) { import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/test.gni") - import("//foundation/communication/dsoftbus/dsoftbus.gni") + import("../../../dsoftbus.gni") defines += [ "HAVE_PRO = 0" ] @@ -37,14 +37,14 @@ if (defined(ohos_lite)) { "//third_party/bounds_checking_function/include", ] deps = [ - "//foundation/communication/dsoftbus/adapter:softbus_adapter", + "../../../adapter:softbus_adapter", "//third_party/bounds_checking_function:libsec_static", ] } } } else { import("//build/test.gni") - import("//foundation/communication/dsoftbus/dsoftbus.gni") + import("../../../dsoftbus.gni") defines += [ "HAVE_PRO = 0" ] module_output_path = "dsoftbus/adapter" @@ -58,7 +58,7 @@ if (defined(ohos_lite)) { "//third_party/bounds_checking_function/include", ] deps = [ - "//foundation/communication/dsoftbus/adapter:softbus_adapter", + "../../../adapter:softbus_adapter", "//third_party/bounds_checking_function:libsec_static", "//third_party/googletest:gtest_main", ] @@ -85,7 +85,7 @@ if (defined(ohos_lite)) { "//third_party/bounds_checking_function/include", ] deps = [ - "//foundation/communication/dsoftbus/adapter:softbus_adapter", + "../../../adapter:softbus_adapter", "//third_party/bounds_checking_function:libsec_static", "//third_party/googletest:gtest_main", ] @@ -112,7 +112,7 @@ if (defined(ohos_lite)) { "//third_party/bounds_checking_function/include", ] deps = [ - "//foundation/communication/dsoftbus/adapter:softbus_adapter", + "../../../adapter:softbus_adapter", "//third_party/bounds_checking_function:libsec_static", "//third_party/googletest:gtest_main", ] @@ -139,7 +139,7 @@ if (defined(ohos_lite)) { "//third_party/bounds_checking_function/include", ] deps = [ - "//foundation/communication/dsoftbus/adapter:softbus_adapter", + "../../../adapter:softbus_adapter", "//third_party/bounds_checking_function:libsec_static", "//third_party/googletest:gtest_main", ] @@ -166,7 +166,7 @@ if (defined(ohos_lite)) { "//third_party/bounds_checking_function/include", ] deps = [ - "//foundation/communication/dsoftbus/adapter:softbus_adapter", + "../../../adapter:softbus_adapter", "//third_party/bounds_checking_function:libsec_static", "//third_party/googletest:gtest_main", ] @@ -193,7 +193,7 @@ if (defined(ohos_lite)) { "//third_party/bounds_checking_function/include", ] deps = [ - "//foundation/communication/dsoftbus/adapter:softbus_adapter", + "../../../adapter:softbus_adapter", "//third_party/bounds_checking_function:libsec_static", "//third_party/googletest:gtest_main", ] @@ -219,7 +219,7 @@ if (defined(ohos_lite)) { "$dsoftbus_root_path/core/common/include/", ] deps = [ - "//foundation/communication/dsoftbus/adapter:softbus_adapter", + "../../../adapter:softbus_adapter", "//third_party/googletest:gtest_main", ] if (is_standard_system) { @@ -244,7 +244,7 @@ if (defined(ohos_lite)) { "$dsoftbus_root_path/core/common/include/", ] deps = [ - "//foundation/communication/dsoftbus/adapter:softbus_adapter", + "../../../adapter:softbus_adapter", "//third_party/googletest:gtest_main", ] if (is_standard_system) { @@ -286,7 +286,7 @@ if (defined(ohos_lite)) { ] deps = [ "$dsoftbus_root_path/core/common:softbus_utils", - "//foundation/communication/dsoftbus/adapter:softbus_adapter", + "../../../adapter:softbus_adapter", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] diff --git a/tests/core/authentication/BUILD.gn b/tests/core/authentication/BUILD.gn index 8f35cbf40..8998015bb 100644 --- a/tests/core/authentication/BUILD.gn +++ b/tests/core/authentication/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../dsoftbus.gni") module_output_path = "dsoftbus/auth" diff --git a/tests/core/authentication/fuzztest/unpackauthdata_fuzzer/BUILD.gn b/tests/core/authentication/fuzztest/unpackauthdata_fuzzer/BUILD.gn index 4c10f65ce..62bb00fed 100644 --- a/tests/core/authentication/fuzztest/unpackauthdata_fuzzer/BUILD.gn +++ b/tests/core/authentication/fuzztest/unpackauthdata_fuzzer/BUILD.gn @@ -13,13 +13,13 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/auth" ##############################fuzztest########################################## ohos_fuzztest("UnpackAuthDataFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/core/authentication/fuzztest/unpackauthdata_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/core/authentication/fuzztest/unpackauthdata_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include/", "$dsoftbus_root_path/core/authentication/include", diff --git a/tests/core/bus_center/BUILD.gn b/tests/core/bus_center/BUILD.gn index e1d6e6d8d..35685deb3 100644 --- a/tests/core/bus_center/BUILD.gn +++ b/tests/core/bus_center/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../dsoftbus.gni") group("unittest") { testonly = true diff --git a/tests/core/bus_center/lnn/BUILD.gn b/tests/core/bus_center/lnn/BUILD.gn index 7cd547c75..3bd75fcdc 100644 --- a/tests/core/bus_center/lnn/BUILD.gn +++ b/tests/core/bus_center/lnn/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/LNN" bus_center_unittest_dirs = [ @@ -62,8 +62,6 @@ bus_center_unittest_deps = [ "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", - "//base/security/device_auth/services:deviceauth_sdk", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -115,8 +113,6 @@ lnn_mock_test_deps = [ "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//base/security/device_auth/services:deviceauth_sdk", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -130,6 +126,7 @@ ohos_unittest("LaneTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -138,7 +135,10 @@ ohos_unittest("LaneTest") { "hilog:libhilog", ] } - external_deps += [ "huks:libhukssdk" ] + external_deps += [ + "huks:libhukssdk", + "ipc:ipc_core", + ] } ohos_unittest("NetLedgerTest") { @@ -150,6 +150,7 @@ ohos_unittest("NetLedgerTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -158,7 +159,10 @@ ohos_unittest("NetLedgerTest") { "hilog:libhilog", ] } - external_deps += [ "huks:libhukssdk" ] + external_deps += [ + "huks:libhukssdk", + "ipc:ipc_core", + ] } ohos_unittest("NetBuilderTest") { @@ -170,6 +174,7 @@ ohos_unittest("NetBuilderTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -178,7 +183,10 @@ ohos_unittest("NetBuilderTest") { "hilog:libhilog", ] } - external_deps += [ "huks:libhukssdk" ] + external_deps += [ + "huks:libhukssdk", + "ipc:ipc_core", + ] } ohos_unittest("LNNHuksUtilsTest") { @@ -190,6 +198,7 @@ ohos_unittest("LNNHuksUtilsTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -198,7 +207,10 @@ ohos_unittest("LNNHuksUtilsTest") { "hilog:libhilog", ] } - external_deps += [ "huks:libhukssdk" ] + external_deps += [ + "huks:libhukssdk", + "ipc:ipc_core", + ] } ohos_unittest("LedgerLaneHubTest") { @@ -210,6 +222,7 @@ ohos_unittest("LedgerLaneHubTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -218,7 +231,10 @@ ohos_unittest("LedgerLaneHubTest") { "hilog:libhilog", ] } - external_deps += [ "huks:libhukssdk" ] + external_deps += [ + "huks:libhukssdk", + "ipc:ipc_core", + ] } ohos_unittest("LNNBusCenterIpcTest") { @@ -230,6 +246,7 @@ ohos_unittest("LNNBusCenterIpcTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -238,7 +255,10 @@ ohos_unittest("LNNBusCenterIpcTest") { "hilog:libhilog", ] } - external_deps += [ "huks:libhukssdk" ] + external_deps += [ + "huks:libhukssdk", + "ipc:ipc_core", + ] } ohos_unittest("BusCenterClientProxyTest") { @@ -250,6 +270,7 @@ ohos_unittest("BusCenterClientProxyTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -258,7 +279,10 @@ ohos_unittest("BusCenterClientProxyTest") { "hilog:libhilog", ] } - external_deps += [ "huks:libhukssdk" ] + external_deps += [ + "huks:libhukssdk", + "ipc:ipc_core", + ] } ohos_unittest("BusCenterClientProxyStandardTest") { @@ -270,6 +294,7 @@ ohos_unittest("BusCenterClientProxyStandardTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -278,7 +303,10 @@ ohos_unittest("BusCenterClientProxyStandardTest") { "hilog:libhilog", ] } - external_deps += [ "huks:libhukssdk" ] + external_deps += [ + "huks:libhukssdk", + "ipc:ipc_core", + ] } ohos_unittest("LNNNetBuilderTest") { @@ -320,8 +348,6 @@ ohos_unittest("LNNNetBuilderTest") { "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//base/security/device_auth/services:deviceauth_sdk", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -329,6 +355,7 @@ ohos_unittest("LNNNetBuilderTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -391,8 +418,6 @@ ohos_unittest("LNNNetBuilderMockTest") { deps = [ "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//base/security/device_auth/services:deviceauth_sdk", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -400,6 +425,7 @@ ohos_unittest("LNNNetBuilderMockTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -437,6 +463,7 @@ ohos_unittest("LNNConnectionFsmTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -474,6 +501,7 @@ ohos_unittest("LNNDeviceNameInfoTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -511,6 +539,7 @@ ohos_unittest("LNNNetworkInfoTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -548,6 +577,7 @@ ohos_unittest("LNNNodeWeightTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -585,6 +615,7 @@ ohos_unittest("LNNP2pInfoTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -622,6 +653,7 @@ ohos_unittest("LNNSyncInfoManagerTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -659,6 +691,7 @@ ohos_unittest("LNNTopoManagerTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -720,8 +753,6 @@ ohos_unittest("LNNBtNetworkImplMockTest") { "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//base/security/device_auth/services:deviceauth_sdk", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -729,6 +760,7 @@ ohos_unittest("LNNBtNetworkImplMockTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -786,8 +818,6 @@ ohos_unittest("LNNNetworkManagerMockTest") { deps = [ "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//base/security/device_auth/services:deviceauth_sdk", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -795,6 +825,7 @@ ohos_unittest("LNNNetworkManagerMockTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -853,8 +884,6 @@ ohos_unittest("LNNIpNetworkImplMockTest") { "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//base/security/device_auth/services:deviceauth_sdk", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -862,6 +891,7 @@ ohos_unittest("LNNIpNetworkImplMockTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -922,8 +952,6 @@ ohos_unittest("LNNLedgerMockTest") { deps = [ "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//base/security/device_auth/services:deviceauth_sdk", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -931,6 +959,7 @@ ohos_unittest("LNNLedgerMockTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -984,8 +1013,6 @@ ohos_unittest("LNNNetLedgerCommonTest") { "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//base/security/device_auth/services:deviceauth_sdk", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -997,6 +1024,7 @@ ohos_unittest("LNNNetLedgerCommonTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -1050,8 +1078,6 @@ ohos_unittest("LNNDisctributedLedgerTest") { "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//base/security/device_auth/services:deviceauth_sdk", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -1063,6 +1089,7 @@ ohos_unittest("LNNDisctributedLedgerTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -1120,8 +1147,6 @@ ohos_unittest("LNNMetaNodeLedgerTest") { "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//base/security/device_auth/services:deviceauth_sdk", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -1133,6 +1158,7 @@ ohos_unittest("LNNMetaNodeLedgerTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -1196,8 +1222,6 @@ ohos_unittest("LNNLaneMockTest") { deps = [ "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//base/security/device_auth/services:deviceauth_sdk", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -1205,6 +1229,7 @@ ohos_unittest("LNNLaneMockTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -1256,8 +1281,6 @@ ohos_unittest("LNNLaneLinkMockTest") { deps = [ "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//base/security/device_auth/services:deviceauth_sdk", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -1265,6 +1288,7 @@ ohos_unittest("LNNLaneLinkMockTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -1320,8 +1344,6 @@ ohos_unittest("LNNTransLaneMockTest") { deps = [ "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//base/security/device_auth/services:deviceauth_sdk", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -1329,6 +1351,7 @@ ohos_unittest("LNNTransLaneMockTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -1370,7 +1393,6 @@ ohos_unittest("LNNDiscoveryInterfaceTest") { deps = [ "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -1449,8 +1471,6 @@ if (!defined(ohos_lite) && enhanced_test) { "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//base/security/device_auth/services:deviceauth_sdk", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -1458,6 +1478,7 @@ if (!defined(ohos_lite) && enhanced_test) { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { diff --git a/tests/core/bus_center/test/BUILD.gn b/tests/core/bus_center/test/BUILD.gn index b985d6ed2..472a93195 100644 --- a/tests/core/bus_center/test/BUILD.gn +++ b/tests/core/bus_center/test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/LNN" @@ -56,24 +56,25 @@ ohos_unittest("HeartBeatMediumTest") { deps = [ "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", - "//base/security/device_auth/services:deviceauth_sdk", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] if (is_standard_system) { external_deps = [ - "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { external_deps = [ - "c_utils:utils", "hilog:libhilog", "huks:libhukssdk", ] } + external_deps += [ + "c_utils:utils", + "ipc:ipc_core", + ] } ohos_unittest("HeartBeatFSMTest") { @@ -118,7 +119,6 @@ ohos_unittest("HeartBeatFSMTest") { deps = [ "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", - "//base/security/device_auth/services:deviceauth_sdk", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", @@ -127,6 +127,7 @@ ohos_unittest("HeartBeatFSMTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { @@ -154,8 +155,8 @@ ohos_unittest("ClientProxyTest") { "$dsoftbus_root_path/core/frame/standard/client_manager/include", "$dsoftbus_root_path/core/common/include", "$dsoftbus_root_path/core/frame/common/include", + "../../transmission/ipc/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/window/window_manager/previewer/mock", - "//foundation/communication/dsoftbus/tests/core/transmission/ipc/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include/", @@ -165,7 +166,6 @@ ohos_unittest("ClientProxyTest") { "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", - "//base/security/device_auth/services:deviceauth_sdk", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", @@ -174,6 +174,7 @@ ohos_unittest("ClientProxyTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", ] @@ -216,7 +217,6 @@ ohos_unittest("BusCenterIpcTest") { deps = [ "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", - "//base/security/device_auth/services:deviceauth_sdk", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", @@ -225,6 +225,7 @@ ohos_unittest("BusCenterIpcTest") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { diff --git a/tests/core/bus_center/utils/BUILD.gn b/tests/core/bus_center/utils/BUILD.gn index 521fb5d8c..b62b0b633 100644 --- a/tests/core/bus_center/utils/BUILD.gn +++ b/tests/core/bus_center/utils/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/LNN" ohos_unittest("LNNConnAddrUtilsTest") { @@ -56,14 +56,13 @@ ohos_unittest("LNNConnAddrUtilsTest") { "$dsoftbus_root_path/adapter:softbus_adapter", "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//base/security/device_auth/services:deviceauth_sdk", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] if (is_standard_system) { external_deps = [ "c_utils:utils", + "device_auth:deviceauth_sdk", "hiviewdfx_hilog_native:libhilog", ] } else { diff --git a/tests/core/common/BUILD.gn b/tests/core/common/BUILD.gn index b87557d22..943153826 100644 --- a/tests/core/common/BUILD.gn +++ b/tests/core/common/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../dsoftbus.gni") group("unittest") { testonly = true diff --git a/tests/core/common/anonymize/BUILD.gn b/tests/core/common/anonymize/BUILD.gn index 5bd73544a..6ccaad7bd 100644 --- a/tests/core/common/anonymize/BUILD.gn +++ b/tests/core/common/anonymize/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") if (defined(ohos_lite)) { import("//build/lite/config/component/lite_component.gni") diff --git a/tests/core/common/bitmap/BUILD.gn b/tests/core/common/bitmap/BUILD.gn index ddc2c7001..1f5e9842e 100755 --- a/tests/core/common/bitmap/BUILD.gn +++ b/tests/core/common/bitmap/BUILD.gn @@ -9,9 +9,9 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -# limitations under the License. +# limitations under the License. -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") if (defined(ohos_lite)) { import("//build/lite/config/component/lite_component.gni") diff --git a/tests/core/common/dfx/hidumper_adapter/fuzztest/softbushidumper_fuzzer/BUILD.gn b/tests/core/common/dfx/hidumper_adapter/fuzztest/softbushidumper_fuzzer/BUILD.gn index ab9ce5140..a55e759f5 100644 --- a/tests/core/common/dfx/hidumper_adapter/fuzztest/softbushidumper_fuzzer/BUILD.gn +++ b/tests/core/common/dfx/hidumper_adapter/fuzztest/softbushidumper_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("SoftBusHiDumperFuzzTest") { diff --git a/tests/core/common/dfx/hidumper_adapter/unittest/BUILD.gn b/tests/core/common/dfx/hidumper_adapter/unittest/BUILD.gn index f581b3324..37123ce74 100644 --- a/tests/core/common/dfx/hidumper_adapter/unittest/BUILD.gn +++ b/tests/core/common/dfx/hidumper_adapter/unittest/BUILD.gn @@ -14,7 +14,7 @@ import("//build/lite/config/component/lite_component.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/common" diff --git a/tests/core/common/dfx/hisysevent_adapter/fuzztest/softbushisysevt_fuzzer/BUILD.gn b/tests/core/common/dfx/hisysevent_adapter/fuzztest/softbushisysevt_fuzzer/BUILD.gn index 581e7dc44..69f0ff188 100644 --- a/tests/core/common/dfx/hisysevent_adapter/fuzztest/softbushisysevt_fuzzer/BUILD.gn +++ b/tests/core/common/dfx/hisysevent_adapter/fuzztest/softbushisysevt_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("SoftBusHiSysEvtFuzzTest") { diff --git a/tests/core/common/dfx/hisysevent_adapter/unittest/BUILD.gn b/tests/core/common/dfx/hisysevent_adapter/unittest/BUILD.gn index 1d69059ad..96a0e663e 100644 --- a/tests/core/common/dfx/hisysevent_adapter/unittest/BUILD.gn +++ b/tests/core/common/dfx/hisysevent_adapter/unittest/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") if (defined(ohos_lite)) { import("//build/lite/config/component/lite_component.gni") 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 1d85f3814..e38fdc490 100644 --- a/tests/core/common/json_utils/fuzztest/jsonutils_fuzzer/BUILD.gn +++ b/tests/core/common/json_utils/fuzztest/jsonutils_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("JsonUtilsFuzzTest") { diff --git a/tests/core/common/log/fuzztest/softbuslog_fuzzer/BUILD.gn b/tests/core/common/log/fuzztest/softbuslog_fuzzer/BUILD.gn index f242cf821..9619d0523 100644 --- a/tests/core/common/log/fuzztest/softbuslog_fuzzer/BUILD.gn +++ b/tests/core/common/log/fuzztest/softbuslog_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("SoftBusLogFuzzTest") { diff --git a/tests/core/common/log/unittest/BUILD.gn b/tests/core/common/log/unittest/BUILD.gn index 73099234e..5eceda896 100644 --- a/tests/core/common/log/unittest/BUILD.gn +++ b/tests/core/common/log/unittest/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/common" 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 94aaa4779..a3917a02d 100644 --- a/tests/core/common/message_handler/fuzztest/messagehandler_fuzzer/BUILD.gn +++ b/tests/core/common/message_handler/fuzztest/messagehandler_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("MessageHandlerFuzzTest") { diff --git a/tests/core/common/message_handler/unittest/BUILD.gn b/tests/core/common/message_handler/unittest/BUILD.gn index bc3d985ce..03b5df4b3 100644 --- a/tests/core/common/message_handler/unittest/BUILD.gn +++ b/tests/core/common/message_handler/unittest/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/lite/config/component/lite_component.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") static_library("softbus_test_message_handler") { sources = [ "message_handler_test.c" ] diff --git a/tests/core/common/network/BUILD.gn b/tests/core/common/network/BUILD.gn index 6d0f3587b..fd46b56bb 100755 --- a/tests/core/common/network/BUILD.gn +++ b/tests/core/common/network/BUILD.gn @@ -9,9 +9,9 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -# limitations under the License. +# limitations under the License. -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") if (defined(ohos_lite)) { } else { diff --git a/tests/core/common/security/permission/common/BUILD.gn b/tests/core/common/security/permission/common/BUILD.gn index 3c9eeb25a..32b9f2acc 100644 --- a/tests/core/common/security/permission/common/BUILD.gn +++ b/tests/core/common/security/permission/common/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/core/common/security/permission/standard/BUILD.gn b/tests/core/common/security/permission/standard/BUILD.gn index 518453555..3e943fa3e 100644 --- a/tests/core/common/security/permission/standard/BUILD.gn +++ b/tests/core/common/security/permission/standard/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/core/common/sequence_verification/BUILD.gn b/tests/core/common/sequence_verification/BUILD.gn index d20ed988d..17dcdd347 100644 --- a/tests/core/common/sequence_verification/BUILD.gn +++ b/tests/core/common/sequence_verification/BUILD.gn @@ -14,7 +14,7 @@ if (defined(ohos_lite)) { import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/test.gni") - import("//foundation/communication/dsoftbus/dsoftbus.gni") + import("../../../../dsoftbus.gni") if (ohos_build_type == "debug") { unittest("SequenceVerificationTest") { @@ -31,7 +31,7 @@ if (defined(ohos_lite)) { } } else { import("//build/test.gni") - import("//foundation/communication/dsoftbus/dsoftbus.gni") + import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/common" ohos_unittest("SequenceVerificationTest") { diff --git a/tests/core/common/utils/BUILD.gn b/tests/core/common/utils/BUILD.gn index 82e1a7d0b..2e42f67d1 100644 --- a/tests/core/common/utils/BUILD.gn +++ b/tests/core/common/utils/BUILD.gn @@ -14,7 +14,7 @@ if (defined(ohos_lite)) { import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/test.gni") - import("//foundation/communication/dsoftbus/dsoftbus.gni") + import("../../../../dsoftbus.gni") if (ohos_build_type == "debug") { unittest("SoftbusUtilsTest") { @@ -31,7 +31,7 @@ if (defined(ohos_lite)) { } } else { import("//build/test.gni") - import("//foundation/communication/dsoftbus/dsoftbus.gni") + import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/common" ohos_unittest("SoftbusUtilsTest") { diff --git a/tests/core/common/utils/fuzztest/bindparatext_fuzzer/BUILD.gn b/tests/core/common/utils/fuzztest/bindparatext_fuzzer/BUILD.gn index 0a48fc48c..f716b0081 100755 --- a/tests/core/common/utils/fuzztest/bindparatext_fuzzer/BUILD.gn +++ b/tests/core/common/utils/fuzztest/bindparatext_fuzzer/BUILD.gn @@ -14,13 +14,14 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/common" ##############################fuzztest########################################## ohos_fuzztest("BindParaTextFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/core/common/utils/fuzztest/bindparatext_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/core/common/utils/fuzztest/bindparatext_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include" ] cflags = [ "-g", diff --git a/tests/core/common/utils/fuzztest/convertbtmactobinary_fuzzer/BUILD.gn b/tests/core/common/utils/fuzztest/convertbtmactobinary_fuzzer/BUILD.gn index 2b99f64ac..97834898c 100755 --- a/tests/core/common/utils/fuzztest/convertbtmactobinary_fuzzer/BUILD.gn +++ b/tests/core/common/utils/fuzztest/convertbtmactobinary_fuzzer/BUILD.gn @@ -14,13 +14,13 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/common" ##############################fuzztest########################################## ohos_fuzztest("ConvertBtMacToBinaryFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/core/common/utils/fuzztest/convertbtmactobinary_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/core/common/utils/fuzztest/convertbtmactobinary_fuzzer" include_dirs = [ "$dsoftbus_root_path/core/common/include" ] cflags = [ "-g", diff --git a/tests/core/common/utils/fuzztest/convertbtmactostr_fuzzer/BUILD.gn b/tests/core/common/utils/fuzztest/convertbtmactostr_fuzzer/BUILD.gn index 32e44a867..2d6e41adf 100755 --- a/tests/core/common/utils/fuzztest/convertbtmactostr_fuzzer/BUILD.gn +++ b/tests/core/common/utils/fuzztest/convertbtmactostr_fuzzer/BUILD.gn @@ -14,13 +14,13 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/common" ##############################fuzztest########################################## ohos_fuzztest("ConvertBtMacToStrFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/core/common/utils/fuzztest/convertbtmactostr_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/core/common/utils/fuzztest/convertbtmactostr_fuzzer" include_dirs = [ "$dsoftbus_root_path/core/common/include" ] cflags = [ "-g", diff --git a/tests/core/common/utils/fuzztest/converthexstringtobytes_fuzzer/BUILD.gn b/tests/core/common/utils/fuzztest/converthexstringtobytes_fuzzer/BUILD.gn index 36ab84be4..dd0897a58 100755 --- a/tests/core/common/utils/fuzztest/converthexstringtobytes_fuzzer/BUILD.gn +++ b/tests/core/common/utils/fuzztest/converthexstringtobytes_fuzzer/BUILD.gn @@ -14,13 +14,13 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/common" ##############################fuzztest########################################## ohos_fuzztest("ConvertHexStringToBytesFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/core/common/utils/fuzztest/converthexstringtobytes_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/core/common/utils/fuzztest/converthexstringtobytes_fuzzer" include_dirs = [ "$dsoftbus_root_path/core/common/include" ] cflags = [ "-g", diff --git a/tests/core/common/utils/fuzztest/encrypteddb_fuzzer/BUILD.gn b/tests/core/common/utils/fuzztest/encrypteddb_fuzzer/BUILD.gn index b5270d8e1..a65db9a86 100755 --- a/tests/core/common/utils/fuzztest/encrypteddb_fuzzer/BUILD.gn +++ b/tests/core/common/utils/fuzztest/encrypteddb_fuzzer/BUILD.gn @@ -14,13 +14,14 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/common" ##############################fuzztest########################################## ohos_fuzztest("EncryptedDbFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/core/common/utils/fuzztest/encrypteddb_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/core/common/utils/fuzztest/encrypteddb_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include" ] cflags = [ "-g", diff --git a/tests/core/common/utils/fuzztest/insertrecord_fuzzer/BUILD.gn b/tests/core/common/utils/fuzztest/insertrecord_fuzzer/BUILD.gn index 8c1574d96..cfc6a7fba 100755 --- a/tests/core/common/utils/fuzztest/insertrecord_fuzzer/BUILD.gn +++ b/tests/core/common/utils/fuzztest/insertrecord_fuzzer/BUILD.gn @@ -14,13 +14,14 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/common" ##############################fuzztest########################################## ohos_fuzztest("InsertRecordFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/core/common/utils/fuzztest/insertrecord_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/core/common/utils/fuzztest/insertrecord_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include" ] cflags = [ "-g", diff --git a/tests/core/common/utils/fuzztest/removeallrecord_fuzzer/BUILD.gn b/tests/core/common/utils/fuzztest/removeallrecord_fuzzer/BUILD.gn index 7b1f8b14a..db2bcd1d0 100755 --- a/tests/core/common/utils/fuzztest/removeallrecord_fuzzer/BUILD.gn +++ b/tests/core/common/utils/fuzztest/removeallrecord_fuzzer/BUILD.gn @@ -14,13 +14,13 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/common" ##############################fuzztest########################################## ohos_fuzztest("RemoveAllRecordFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/core/common/utils/fuzztest/removeallrecord_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/core/common/utils/fuzztest/removeallrecord_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include" ] cflags = [ "-g", diff --git a/tests/core/common/utils/fuzztest/removerecordbykey_fuzzer/BUILD.gn b/tests/core/common/utils/fuzztest/removerecordbykey_fuzzer/BUILD.gn index 18b29c61f..b4b7a098f 100755 --- a/tests/core/common/utils/fuzztest/removerecordbykey_fuzzer/BUILD.gn +++ b/tests/core/common/utils/fuzztest/removerecordbykey_fuzzer/BUILD.gn @@ -14,13 +14,13 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/common" ##############################fuzztest########################################## ohos_fuzztest("RemoveRecordByKeyFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/core/common/utils/fuzztest/removerecordbykey_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/core/common/utils/fuzztest/removerecordbykey_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include" ] cflags = [ "-g", diff --git a/tests/core/common/utils/fuzztest/softbusutils_fuzzer/BUILD.gn b/tests/core/common/utils/fuzztest/softbusutils_fuzzer/BUILD.gn index 2c697ad31..a9fd692cc 100644 --- a/tests/core/common/utils/fuzztest/softbusutils_fuzzer/BUILD.gn +++ b/tests/core/common/utils/fuzztest/softbusutils_fuzzer/BUILD.gn @@ -14,13 +14,14 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/common" ##############################fuzztest########################################## ohos_fuzztest("SoftBusUtilsFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/core/common/utils/fuzztest/softbusutils_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/core/common/utils/fuzztest/softbusutils_fuzzer" include_dirs = [ "$dsoftbus_root_path/core/common/include" ] cflags = [ "-g", diff --git a/tests/core/common/utils/fuzztest/sqlite3utils_fuzzer/BUILD.gn b/tests/core/common/utils/fuzztest/sqlite3utils_fuzzer/BUILD.gn index 00fc9f93f..94da217ed 100644 --- a/tests/core/common/utils/fuzztest/sqlite3utils_fuzzer/BUILD.gn +++ b/tests/core/common/utils/fuzztest/sqlite3utils_fuzzer/BUILD.gn @@ -14,13 +14,14 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/common" ##############################fuzztest########################################## ohos_fuzztest("Sqlite3UtilsFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/core/common/utils/fuzztest/sqlite3utils_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/core/common/utils/fuzztest/sqlite3utils_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include" ] cflags = [ "-g", diff --git a/tests/core/common/utils/fuzztest/updatedbpassword_fuzzer/BUILD.gn b/tests/core/common/utils/fuzztest/updatedbpassword_fuzzer/BUILD.gn index 5f2a086c5..4f9096ec5 100755 --- a/tests/core/common/utils/fuzztest/updatedbpassword_fuzzer/BUILD.gn +++ b/tests/core/common/utils/fuzztest/updatedbpassword_fuzzer/BUILD.gn @@ -14,13 +14,13 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/common" ##############################fuzztest########################################## ohos_fuzztest("UpdateDbPasswordFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/core/common/utils/fuzztest/updatedbpassword_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/core/common/utils/fuzztest/updatedbpassword_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include" ] cflags = [ "-g", diff --git a/tests/core/common/utils/permission_state_test/BUILD.gn b/tests/core/common/utils/permission_state_test/BUILD.gn index ca54b6cc8..e935ccc1f 100644 --- a/tests/core/common/utils/permission_state_test/BUILD.gn +++ b/tests/core/common/utils/permission_state_test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/common" diff --git a/tests/core/connection/BUILD.gn b/tests/core/connection/BUILD.gn index 84d13581f..681baac02 100644 --- a/tests/core/connection/BUILD.gn +++ b/tests/core/connection/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../dsoftbus.gni") group("unittest") { testonly = true diff --git a/tests/core/connection/ble/BUILD.gn b/tests/core/connection/ble/BUILD.gn index cec6a8c1d..05964da2d 100644 --- a/tests/core/connection/ble/BUILD.gn +++ b/tests/core/connection/ble/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/connection" diff --git a/tests/core/connection/br/BUILD.gn b/tests/core/connection/br/BUILD.gn index a1ea87194..229574512 100644 --- a/tests/core/connection/br/BUILD.gn +++ b/tests/core/connection/br/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/connection" config("softbus_connection_br_test_config") { diff --git a/tests/core/connection/common/fuzztest/connectioncommon_fuzzer/BUILD.gn b/tests/core/connection/common/fuzztest/connectioncommon_fuzzer/BUILD.gn index 16a6cb53e..44ef160d1 100644 --- a/tests/core/connection/common/fuzztest/connectioncommon_fuzzer/BUILD.gn +++ b/tests/core/connection/common/fuzztest/connectioncommon_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("ConnectionCommonFuzzTest") { @@ -23,8 +23,8 @@ ohos_fuzztest("ConnectionCommonFuzzTest") { fuzz_config_file = "$dsoftbus_root_path/tests/core/connection/common/fuzztest/connectioncommon_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/connection/common/include", - "//foundation/communication/dsoftbus/core/connection/interface", + "$dsoftbus_root_path/core/connection/common/include", + "$dsoftbus_root_path/core/connection/interface", ] cflags = [ diff --git a/tests/core/connection/common/unittest/BUILD.gn b/tests/core/connection/common/unittest/BUILD.gn index e210583c9..dfe60078d 100644 --- a/tests/core/connection/common/unittest/BUILD.gn +++ b/tests/core/connection/common/unittest/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/connection" diff --git a/tests/core/connection/manager/BUILD.gn b/tests/core/connection/manager/BUILD.gn index 89673ab3c..99820ee16 100644 --- a/tests/core/connection/manager/BUILD.gn +++ b/tests/core/connection/manager/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/connection" diff --git a/tests/core/connection/p2p/BUILD.gn b/tests/core/connection/p2p/BUILD.gn index 809d811fe..65eca8b4d 100644 --- a/tests/core/connection/p2p/BUILD.gn +++ b/tests/core/connection/p2p/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/connection" diff --git a/tests/core/connection/p2p/common_mock/BUILD.gn b/tests/core/connection/p2p/common_mock/BUILD.gn index d833a9aa5..e8251a340 100644 --- a/tests/core/connection/p2p/common_mock/BUILD.gn +++ b/tests/core/connection/p2p/common_mock/BUILD.gn @@ -14,8 +14,8 @@ import("//build/lite/config/component/lite_component.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") -import("//foundation/communication/dsoftbus/tests/utils/utils.gni") +import("../../../../../dsoftbus.gni") +import("../../../../utils/utils.gni") module_output_path = "dsoftbus/connection" diff --git a/tests/core/connection/p2p/interface_mock/BUILD.gn b/tests/core/connection/p2p/interface_mock/BUILD.gn index 677775dde..ecae0cfb2 100644 --- a/tests/core/connection/p2p/interface_mock/BUILD.gn +++ b/tests/core/connection/p2p/interface_mock/BUILD.gn @@ -14,8 +14,8 @@ import("//build/lite/config/component/lite_component.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") -import("//foundation/communication/dsoftbus/tests/utils/utils.gni") +import("../../../../../dsoftbus.gni") +import("../../../../utils/utils.gni") module_output_path = "dsoftbus/connection" diff --git a/tests/core/connection/p2p/negotiation/BUILD.gn b/tests/core/connection/p2p/negotiation/BUILD.gn index 8063b2d04..d2823fabe 100644 --- a/tests/core/connection/p2p/negotiation/BUILD.gn +++ b/tests/core/connection/p2p/negotiation/BUILD.gn @@ -14,8 +14,8 @@ import("//build/lite/config/component/lite_component.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") -import("//foundation/communication/dsoftbus/tests/utils/utils.gni") +import("../../../../../dsoftbus.gni") +import("../../../../utils/utils.gni") module_output_path = "dsoftbus/connection" diff --git a/tests/core/connection/tcp/BUILD.gn b/tests/core/connection/tcp/BUILD.gn index f02d0cba2..8d069ff24 100644 --- a/tests/core/connection/tcp/BUILD.gn +++ b/tests/core/connection/tcp/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/connection" diff --git a/tests/core/discovery/BUILD.gn b/tests/core/discovery/BUILD.gn index 01dedd561..107a7547d 100644 --- a/tests/core/discovery/BUILD.gn +++ b/tests/core/discovery/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../dsoftbus.gni") native_source_path = rebase_path("$dsoftbus_root_path") dep_dir = "dsoftbus_enhance/test/core/discovery" diff --git a/tests/core/discovery/ble/dispatcher/BUILD.gn b/tests/core/discovery/ble/dispatcher/BUILD.gn index 60ff1d040..0891fa794 100644 --- a/tests/core/discovery/ble/dispatcher/BUILD.gn +++ b/tests/core/discovery/ble/dispatcher/BUILD.gn @@ -14,7 +14,7 @@ import("//build/lite/config/component/lite_component.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/discovery" diff --git a/tests/core/discovery/ble/softbus_ble/BUILD.gn b/tests/core/discovery/ble/softbus_ble/BUILD.gn index 7d068fb68..c64d5c41a 100644 --- a/tests/core/discovery/ble/softbus_ble/BUILD.gn +++ b/tests/core/discovery/ble/softbus_ble/BUILD.gn @@ -14,7 +14,7 @@ import("//build/lite/config/component/lite_component.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/discovery" @@ -23,11 +23,11 @@ ohos_unittest("DiscSoftBusBleTest") { sources = [ "disc_ble_softbus_test.cpp" ] include_dirs = [ - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/core/discovery/ble/dispatcher/include", - "//foundation/communication/dsoftbus/core/discovery/manager/include", - "//foundation/communication/dsoftbus/core/discovery/interface", - "//foundation/communication/dsoftbus/core/discovery/ble/softbus_ble/include", + "$dsoftbus_root_path/core/common/include", + "$dsoftbus_root_path/core/discovery/ble/dispatcher/include", + "$dsoftbus_root_path/core/discovery/manager/include", + "$dsoftbus_root_path/core/discovery/interface", + "$dsoftbus_root_path/core/discovery/ble/softbus_ble/include", "$dsoftbus_root_path/interfaces/kits/common", "$dsoftbus_root_path/interfaces/kits/discovery", "$dsoftbus_root_path/interfaces/kits/bus_center", @@ -51,9 +51,9 @@ ohos_unittest("DiscSoftBusBleTest") { deps = [ "$dsoftbus_root_path/adapter:softbus_adapter", + "$dsoftbus_root_path/components/nstackx/nstackx_ctrl:nstackx_ctrl", "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", - "//foundation/communication/dsoftbus/components/nstackx/nstackx_ctrl:nstackx_ctrl", "//third_party/googletest:gtest_main", ] diff --git a/tests/core/discovery/ble/softbus_ble_mock/BUILD.gn b/tests/core/discovery/ble/softbus_ble_mock/BUILD.gn index 680cefce6..f64dfadbf 100644 --- a/tests/core/discovery/ble/softbus_ble_mock/BUILD.gn +++ b/tests/core/discovery/ble/softbus_ble_mock/BUILD.gn @@ -14,8 +14,8 @@ import("//build/lite/config/component/lite_component.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") -import("//foundation/communication/dsoftbus/tests/utils/utils.gni") +import("../../../../../dsoftbus.gni") +import("../../../../utils/utils.gni") module_output_path = "dsoftbus/discovery" diff --git a/tests/core/discovery/coap/BUILD.gn b/tests/core/discovery/coap/BUILD.gn index 0ed1cfbb6..72d361a8e 100644 --- a/tests/core/discovery/coap/BUILD.gn +++ b/tests/core/discovery/coap/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") if (defined(ohos_lite)) { import("//build/lite/config/component/lite_component.gni") diff --git a/tests/core/discovery/coap/nstackx_adapter_mock/BUILD.gn b/tests/core/discovery/coap/nstackx_adapter_mock/BUILD.gn index 79c10e414..70de51bcc 100644 --- a/tests/core/discovery/coap/nstackx_adapter_mock/BUILD.gn +++ b/tests/core/discovery/coap/nstackx_adapter_mock/BUILD.gn @@ -14,8 +14,8 @@ import("//build/lite/config/component/lite_component.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") -import("//foundation/communication/dsoftbus/tests/utils/utils.gni") +import("../../../../../dsoftbus.gni") +import("../../../../utils/utils.gni") module_output_path = "dsoftbus/discovery" diff --git a/tests/core/discovery/coap/unittest/BUILD.gn b/tests/core/discovery/coap/unittest/BUILD.gn index eea1f7d56..e4da8ef9a 100755 --- a/tests/core/discovery/coap/unittest/BUILD.gn +++ b/tests/core/discovery/coap/unittest/BUILD.gn @@ -14,7 +14,7 @@ import("//build/lite/config/component/lite_component.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/discovery" @@ -23,30 +23,29 @@ ohos_unittest("DiscNstackxAdapterTest") { sources = [ "disc_nstackx_adapter_test.cpp" ] include_dirs = [ - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/core/discovery/ble/dispatcher/include", - "//foundation/communication/dsoftbus/core/discovery/manager/include", - "//foundation/communication/dsoftbus/core/discovery/interface", - "//foundation/communication/dsoftbus/core/discovery/coap/include", - "//foundation/communication/dsoftbus/core/discovery/coap/src", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/components/nstackx/nstackx_util/interface", - "//foundation/communication/dsoftbus/components/nstackx/nstackx_ctrl/include", - "//foundation/communication/dsoftbus/core/bus_center/interface", - "//foundation/communication/dsoftbus/core/bus_center/lnn/lane_hub/lane_manager/include", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/adapter/default_config/spec_config", - "//foundation/communication/dsoftbus//core/common/dfx/hidumper_adapter/include", - "//foundation/communication/dsoftbus//core/discovery/manager/include", - "//foundation/communication/dsoftbus//core/bus_center/lnn/net_ledger/local_ledger/include", - "//foundation/communication/dsoftbus//core/bus_center/lnn/net_ledger/common/include", + "../../../../../adapter/common/include", + "../../../../../adapter/default_config/spec_config", + "../../../../../components/nstackx/nstackx_util/interface", + "../../../../../components/nstackx/nstackx_ctrl/include", + "../../../../../core/bus_center/interface", + "../../../../../core/bus_center/lnn/lane_hub/lane_manager/include", + "../../../../../core/bus_center/lnn/net_ledger/common/include", + "../../../../../core/bus_center/lnn/net_ledger/local_ledger/include", + "../../../../../core/common/dfx/hidumper_adapter/include", + "../../../../../core/common/include", + "../../../../../core/discovery/ble/dispatcher/include", + "../../../../../core/discovery/coap/include", + "../../../../../core/discovery/coap/src", + "../../../../../core/discovery/interface", + "../../../../../core/discovery/manager/include", + "../../../../../interfaces/kits/common", "//third_party/cJSON", ] deps = [ - "//foundation/communication/dsoftbus/components/nstackx/nstackx_ctrl:nstackx_ctrl", - "//foundation/communication/dsoftbus/core/common:softbus_utils", - "//foundation/communication/dsoftbus/core/frame:softbus_server", + "../../../../../components/nstackx/nstackx_ctrl:nstackx_ctrl", + "../../../../../core/common:softbus_utils", + "../../../../../core/frame:softbus_server", "//third_party/googletest:gtest_main", ] @@ -68,29 +67,28 @@ ohos_unittest("DiscCoapTest") { sources = [ "disc_coap_test.cpp" ] include_dirs = [ - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/core/discovery/ble/dispatcher/include", - "//foundation/communication/dsoftbus/core/discovery/manager/include", - "//foundation/communication/dsoftbus/core/discovery/interface", - "//foundation/communication/dsoftbus/core/discovery/coap/include", - "//foundation/communication/dsoftbus/core/discovery/coap/src", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/components/nstackx/nstackx_util/interface", - "//foundation/communication/dsoftbus/core/bus_center/interface", - "//foundation/communication/dsoftbus/core/bus_center/lnn/lane_hub/lane_manager/include", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/adapter/default_config/spec_config", - "//foundation/communication/dsoftbus//core/common/dfx/hidumper_adapter/include", - "//foundation/communication/dsoftbus//core/discovery/manager/include", - "//foundation/communication/dsoftbus//core/bus_center/lnn/net_ledger/local_ledger/include", - "//foundation/communication/dsoftbus//core/bus_center/lnn/net_ledger/common/include", + "../../../../../adapter/common/include", + "../../../../../adapter/default_config/spec_config", + "../../../../../components/nstackx/nstackx_util/interface", + "../../../../../core/bus_center/interface", + "../../../../../core/bus_center/lnn/lane_hub/lane_manager/include", + "../../../../../core/bus_center/lnn/net_ledger/common/include", + "../../../../../core/bus_center/lnn/net_ledger/local_ledger/include", + "../../../../../core/common/dfx/hidumper_adapter/include", + "../../../../../core/common/include", + "../../../../../core/discovery/ble/dispatcher/include", + "../../../../../core/discovery/coap/include", + "../../../../../core/discovery/coap/src", + "../../../../../core/discovery/interface", + "../../../../../core/discovery/manager/include", + "../../../../../interfaces/kits/common", "//third_party/cJSON", ] deps = [ - "//foundation/communication/dsoftbus/components/nstackx/nstackx_ctrl:nstackx_ctrl", - "//foundation/communication/dsoftbus/core/common:softbus_utils", - "//foundation/communication/dsoftbus/core/frame:softbus_server", + "../../../../../components/nstackx/nstackx_ctrl:nstackx_ctrl", + "../../../../../core/common:softbus_utils", + "../../../../../core/frame:softbus_server", "//third_party/googletest:gtest_main", ] diff --git a/tests/core/discovery/dfinder/BUILD.gn b/tests/core/discovery/dfinder/BUILD.gn index de91c3015..7a648dcb6 100644 --- a/tests/core/discovery/dfinder/BUILD.gn +++ b/tests/core/discovery/dfinder/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/lite/config/component/lite_component.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") static_library("nstackx_test") { sources = [ "nstackx_test.c" ] diff --git a/tests/core/discovery/ipc/BUILD.gn b/tests/core/discovery/ipc/BUILD.gn index b93bfb2ea..dc1537299 100644 --- a/tests/core/discovery/ipc/BUILD.gn +++ b/tests/core/discovery/ipc/BUILD.gn @@ -14,8 +14,8 @@ import("//build/lite/config/component/lite_component.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") -import("//foundation/communication/dsoftbus/tests/utils/utils.gni") +import("../../../../dsoftbus.gni") +import("../../../utils/utils.gni") module_output_path = "dsoftbus/discovery" diff --git a/tests/core/discovery/manager/unittest/BUILD.gn b/tests/core/discovery/manager/unittest/BUILD.gn index bcfd1b50e..3e5be8240 100644 --- a/tests/core/discovery/manager/unittest/BUILD.gn +++ b/tests/core/discovery/manager/unittest/BUILD.gn @@ -14,8 +14,8 @@ import("//build/lite/config/component/lite_component.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") -import("//foundation/communication/dsoftbus/tests/utils/utils.gni") +import("../../../../../dsoftbus.gni") +import("../../../../utils/utils.gni") module_output_path = "dsoftbus/discovery" diff --git a/tests/core/frame/BUILD.gn b/tests/core/frame/BUILD.gn index 12098296c..bacee1a9e 100644 --- a/tests/core/frame/BUILD.gn +++ b/tests/core/frame/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../dsoftbus.gni") config("softbus_frame_test_config") { include_dirs = [ @@ -25,7 +25,7 @@ config("softbus_frame_test_config") { ohos_executable("softbus_test") { install_enable = true - sources = [ "$dsoftbus_root_path/tests/core/frame/softbus_test.c" ] + sources = [ "softbus_test.c" ] configs = [ ":softbus_frame_test_config" ] if (is_standard_system) { diff --git a/tests/core/transmission/BUILD.gn b/tests/core/transmission/BUILD.gn index 1374e799e..235c75f7b 100644 --- a/tests/core/transmission/BUILD.gn +++ b/tests/core/transmission/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../dsoftbus.gni") native_source_path = rebase_path("$dsoftbus_root_path") dep_dir = "dsoftbus_enhance/test/core/transmission" diff --git a/tests/core/transmission/common/BUILD.gn b/tests/core/transmission/common/BUILD.gn index 2fef8bf2e..34363339e 100644 --- a/tests/core/transmission/common/BUILD.gn +++ b/tests/core/transmission/common/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") group("unittest") { testonly = true diff --git a/tests/core/transmission/common/softbus_message_open_channel_test/BUILD.gn b/tests/core/transmission/common/softbus_message_open_channel_test/BUILD.gn index 524d8c0c3..88f5456c6 100644 --- a/tests/core/transmission/common/softbus_message_open_channel_test/BUILD.gn +++ b/tests/core/transmission/common/softbus_message_open_channel_test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/core/transmission/common/trans_pending_pkt_test/BUILD.gn b/tests/core/transmission/common/trans_pending_pkt_test/BUILD.gn index 46e02f676..0be5d6e62 100644 --- a/tests/core/transmission/common/trans_pending_pkt_test/BUILD.gn +++ b/tests/core/transmission/common/trans_pending_pkt_test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/core/transmission/fuzztest/softbusproxychannellistener_fuzzer/BUILD.gn b/tests/core/transmission/fuzztest/softbusproxychannellistener_fuzzer/BUILD.gn index e0a4a81b2..060038e9b 100644 --- a/tests/core/transmission/fuzztest/softbusproxychannellistener_fuzzer/BUILD.gn +++ b/tests/core/transmission/fuzztest/softbusproxychannellistener_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" ##############################fuzztest########################################## diff --git a/tests/core/transmission/fuzztest/softbusproxychannelnetwork_fuzzer/BUILD.gn b/tests/core/transmission/fuzztest/softbusproxychannelnetwork_fuzzer/BUILD.gn index f170b8f22..c9afc9d6f 100644 --- a/tests/core/transmission/fuzztest/softbusproxychannelnetwork_fuzzer/BUILD.gn +++ b/tests/core/transmission/fuzztest/softbusproxychannelnetwork_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" ##############################fuzztest########################################## diff --git a/tests/core/transmission/ipc/BUILD.gn b/tests/core/transmission/ipc/BUILD.gn index 1ca1ff81a..2040dde2c 100644 --- a/tests/core/transmission/ipc/BUILD.gn +++ b/tests/core/transmission/ipc/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" @@ -30,7 +30,6 @@ ohos_unittest("TransClientProxyTest") { "$dsoftbus_root_path/core/frame/standard/client_manager/include", "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/sdk/frame/standard/include", - "//foundation/communication/dsoftbus/tests/core/transmission/ipc/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/window/window_manager/previewer/mock", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", @@ -40,23 +39,19 @@ ohos_unittest("TransClientProxyTest") { deps = [ "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//third_party/googletest:gtest_main", ] if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", - "samgr:samgr_proxy", - ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - "samgr:samgr_proxy", - ] + external_deps = [ "hilog:libhilog" ] } + external_deps += [ + "c_utils:utils", + "ipc:ipc_core", + "samgr:samgr_proxy", + ] } ohos_unittest("TransClientProxyStandardTest") { @@ -73,7 +68,6 @@ ohos_unittest("TransClientProxyStandardTest") { "$dsoftbus_root_path/core/frame/standard/client_manager/include", "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/sdk/frame/standard/include", - "//foundation/communication/dsoftbus/tests/core/transmission/ipc/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include/", "//foundation/window/window_manager/previewer/mock", "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include", @@ -83,23 +77,19 @@ ohos_unittest("TransClientProxyStandardTest") { deps = [ "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//third_party/googletest:gtest_main", ] if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", - "samgr:samgr_proxy", - ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - "samgr:samgr_proxy", - ] + external_deps = [ "hilog:libhilog" ] } + external_deps += [ + "c_utils:utils", + "ipc:ipc_core", + "samgr:samgr_proxy", + ] } group("unittest") { diff --git a/tests/core/transmission/session/BUILD.gn b/tests/core/transmission/session/BUILD.gn index d20dcc193..a4daf7631 100644 --- a/tests/core/transmission/session/BUILD.gn +++ b/tests/core/transmission/session/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/core/transmission/trans_channel/auth_channel/BUILD.gn b/tests/core/transmission/trans_channel/auth_channel/BUILD.gn index c15945837..a90adcce3 100644 --- a/tests/core/transmission/trans_channel/auth_channel/BUILD.gn +++ b/tests/core/transmission/trans_channel/auth_channel/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/core/transmission/trans_channel/common/BUILD.gn b/tests/core/transmission/trans_channel/common/BUILD.gn index c50bcb8b6..beccaceae 100644 --- a/tests/core/transmission/trans_channel/common/BUILD.gn +++ b/tests/core/transmission/trans_channel/common/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/core/transmission/trans_channel/manager/BUILD.gn b/tests/core/transmission/trans_channel/manager/BUILD.gn index b17ee5d91..83df86d44 100644 --- a/tests/core/transmission/trans_channel/manager/BUILD.gn +++ b/tests/core/transmission/trans_channel/manager/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") group("unittest") { testonly = true diff --git a/tests/core/transmission/trans_channel/manager/trans_channel_callback_test/BUILD.gn b/tests/core/transmission/trans_channel/manager/trans_channel_callback_test/BUILD.gn index f3ae930ee..2a36f9097 100644 --- a/tests/core/transmission/trans_channel/manager/trans_channel_callback_test/BUILD.gn +++ b/tests/core/transmission/trans_channel/manager/trans_channel_callback_test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/core/transmission/trans_channel/manager/trans_channel_manager_test/BUILD.gn b/tests/core/transmission/trans_channel/manager/trans_channel_manager_test/BUILD.gn index 1b0e87c23..8ff08821f 100644 --- a/tests/core/transmission/trans_channel/manager/trans_channel_manager_test/BUILD.gn +++ b/tests/core/transmission/trans_channel/manager/trans_channel_manager_test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/core/transmission/trans_channel/manager/trans_lane_manager_test/BUILD.gn b/tests/core/transmission/trans_channel/manager/trans_lane_manager_test/BUILD.gn index 32be44e1c..d51dcb829 100644 --- a/tests/core/transmission/trans_channel/manager/trans_lane_manager_test/BUILD.gn +++ b/tests/core/transmission/trans_channel/manager/trans_lane_manager_test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/core/transmission/trans_channel/manager/trans_link_listener_test/BUILD.gn b/tests/core/transmission/trans_channel/manager/trans_link_listener_test/BUILD.gn index a727d5e81..3fe7e020a 100644 --- a/tests/core/transmission/trans_channel/manager/trans_link_listener_test/BUILD.gn +++ b/tests/core/transmission/trans_channel/manager/trans_link_listener_test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/core/transmission/trans_channel/proxy_channel/BUILD.gn b/tests/core/transmission/trans_channel/proxy_channel/BUILD.gn index 977723d00..f791f8453 100644 --- a/tests/core/transmission/trans_channel/proxy_channel/BUILD.gn +++ b/tests/core/transmission/trans_channel/proxy_channel/BUILD.gn @@ -12,9 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") -import( - "//foundation/communication/dsoftbus/tests/core/transmission/common/mock/mock.gni") +import("../../../../../dsoftbus.gni") +import("../../common/mock/mock.gni") module_output_path = "dsoftbus/transmission" @@ -90,10 +89,8 @@ ohos_unittest("TransProxyChannelTest") { } } -import( - "//foundation/communication/dsoftbus/core/transmission/trans_channel/common/common.gni") -import( - "//foundation/communication/dsoftbus/core/transmission/trans_channel/proxy/proxy.gni") +import("../../../../../core/transmission/trans_channel/common/common.gni") +import("../../../../../core/transmission/trans_channel/proxy/proxy.gni") ohos_unittest("TransProxyChannelMockTest") { module_out_path = module_output_path diff --git a/tests/core/transmission/trans_channel/tcp_direct/BUILD.gn b/tests/core/transmission/trans_channel/tcp_direct/BUILD.gn index 6c0c16066..c66a67bd6 100644 --- a/tests/core/transmission/trans_channel/tcp_direct/BUILD.gn +++ b/tests/core/transmission/trans_channel/tcp_direct/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/core/transmission/trans_channel/udp_negotiation/BUILD.gn b/tests/core/transmission/trans_channel/udp_negotiation/BUILD.gn index ad5b8358c..6cc34aae3 100644 --- a/tests/core/transmission/trans_channel/udp_negotiation/BUILD.gn +++ b/tests/core/transmission/trans_channel/udp_negotiation/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/sdk/bus_center/BUILD.gn b/tests/sdk/bus_center/BUILD.gn index ecdad4da5..954d2e5f7 100644 --- a/tests/sdk/bus_center/BUILD.gn +++ b/tests/sdk/bus_center/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../dsoftbus.gni") group("benchmarktest") { testonly = true diff --git a/tests/sdk/bus_center/benchmarktest/BUILD.gn b/tests/sdk/bus_center/benchmarktest/BUILD.gn index 241768b2d..b7896ed98 100644 --- a/tests/sdk/bus_center/benchmarktest/BUILD.gn +++ b/tests/sdk/bus_center/benchmarktest/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" diff --git a/tests/sdk/bus_center/fuzztest/activemetanode_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/activemetanode_fuzzer/BUILD.gn index bd988fbaa..b3055e4a9 100644 --- a/tests/sdk/bus_center/fuzztest/activemetanode_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/activemetanode_fuzzer/BUILD.gn @@ -13,13 +13,14 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("ActiveMetaNodeFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/activemetanode_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/activemetanode_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", diff --git a/tests/sdk/bus_center/fuzztest/deactivemetanode_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/deactivemetanode_fuzzer/BUILD.gn index 2d67c194f..9daafea4d 100644 --- a/tests/sdk/bus_center/fuzztest/deactivemetanode_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/deactivemetanode_fuzzer/BUILD.gn @@ -13,13 +13,13 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("DeactiveMetaNodeFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/deactivemetanode_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/deactivemetanode_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", diff --git a/tests/sdk/bus_center/fuzztest/getallmetanodeinfo_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/getallmetanodeinfo_fuzzer/BUILD.gn index f901fdb00..b6b9950b9 100644 --- a/tests/sdk/bus_center/fuzztest/getallmetanodeinfo_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/getallmetanodeinfo_fuzzer/BUILD.gn @@ -13,13 +13,13 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("GetAllMetaNodeInfoFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/getallmetanodeinfo_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/getallmetanodeinfo_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", diff --git a/tests/sdk/bus_center/fuzztest/getallnodedeviceinfo_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/getallnodedeviceinfo_fuzzer/BUILD.gn index d5c0e2520..a59406b27 100644 --- a/tests/sdk/bus_center/fuzztest/getallnodedeviceinfo_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/getallnodedeviceinfo_fuzzer/BUILD.gn @@ -13,13 +13,13 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("GetAllNodeDeviceInfoFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/getallnodedeviceinfo_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/getallnodedeviceinfo_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", diff --git a/tests/sdk/bus_center/fuzztest/getlocalnodedeviceinfo_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/getlocalnodedeviceinfo_fuzzer/BUILD.gn index f977093c8..c5a348c5e 100644 --- a/tests/sdk/bus_center/fuzztest/getlocalnodedeviceinfo_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/getlocalnodedeviceinfo_fuzzer/BUILD.gn @@ -13,13 +13,13 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("GetLocalNodeDeviceInfoFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/getlocalnodedeviceinfo_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/getlocalnodedeviceinfo_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", diff --git a/tests/sdk/bus_center/fuzztest/getnodekeyinfo_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/getnodekeyinfo_fuzzer/BUILD.gn index 774cce731..5ca309794 100644 --- a/tests/sdk/bus_center/fuzztest/getnodekeyinfo_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/getnodekeyinfo_fuzzer/BUILD.gn @@ -13,13 +13,14 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("GetNodeKeyInfoFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/getnodekeyinfo_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/getnodekeyinfo_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", diff --git a/tests/sdk/bus_center/fuzztest/ispassseqcheck_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/ispassseqcheck_fuzzer/BUILD.gn index 6c4f32918..d43110f14 100644 --- a/tests/sdk/bus_center/fuzztest/ispassseqcheck_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/ispassseqcheck_fuzzer/BUILD.gn @@ -13,13 +13,14 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("IsPassSeqCheckFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/ispassseqcheck_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/ispassseqcheck_fuzzer" include_dirs = [ "$dsoftbus_root_path/core/common/include" ] cflags = [ diff --git a/tests/sdk/bus_center/fuzztest/joinlnn_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/joinlnn_fuzzer/BUILD.gn index 20b8d7ffa..966d2cf33 100644 --- a/tests/sdk/bus_center/fuzztest/joinlnn_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/joinlnn_fuzzer/BUILD.gn @@ -13,13 +13,14 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("JoinLNNFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/joinlnn_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/joinlnn_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", diff --git a/tests/sdk/bus_center/fuzztest/joinmetanode_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/joinmetanode_fuzzer/BUILD.gn index b93ce2808..fd77a8600 100644 --- a/tests/sdk/bus_center/fuzztest/joinmetanode_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/joinmetanode_fuzzer/BUILD.gn @@ -13,13 +13,14 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("JoinMetaNodeFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/joinmetanode_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/joinmetanode_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", diff --git a/tests/sdk/bus_center/fuzztest/leavelnn_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/leavelnn_fuzzer/BUILD.gn index d8ee57547..0d64410a5 100644 --- a/tests/sdk/bus_center/fuzztest/leavelnn_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/leavelnn_fuzzer/BUILD.gn @@ -13,13 +13,14 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("LeaveLNNFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/leavelnn_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/leavelnn_fuzzer" include_dirs = [ "$dsoftbus_root_path/core/common/include", "$dsoftbus_root_path/interfaces/kits/bus_center", diff --git a/tests/sdk/bus_center/fuzztest/leavelnninner_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/leavelnninner_fuzzer/BUILD.gn index d1f0d5db2..87d74d32a 100755 --- a/tests/sdk/bus_center/fuzztest/leavelnninner_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/leavelnninner_fuzzer/BUILD.gn @@ -13,13 +13,14 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("LeaveLNNInnerFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/leavelnninner_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/leavelnninner_fuzzer" include_dirs = [ "$dsoftbus_root_path/core/common/include", "$dsoftbus_root_path/interfaces/kits/bus_center", diff --git a/tests/sdk/bus_center/fuzztest/publishlnn_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/publishlnn_fuzzer/BUILD.gn index af3d86fa9..a8feaaacd 100644 --- a/tests/sdk/bus_center/fuzztest/publishlnn_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/publishlnn_fuzzer/BUILD.gn @@ -13,13 +13,14 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("PublishLNNFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/publishlnn_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/publishlnn_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", diff --git a/tests/sdk/bus_center/fuzztest/refreshlnn_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/refreshlnn_fuzzer/BUILD.gn index 9d48506cd..a42a7f8e9 100644 --- a/tests/sdk/bus_center/fuzztest/refreshlnn_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/refreshlnn_fuzzer/BUILD.gn @@ -13,13 +13,14 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("RefreshLNNFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/refreshlnn_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/refreshlnn_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", diff --git a/tests/sdk/bus_center/fuzztest/regnodedevicestatecb_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/regnodedevicestatecb_fuzzer/BUILD.gn index 603668176..456258a8a 100644 --- a/tests/sdk/bus_center/fuzztest/regnodedevicestatecb_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/regnodedevicestatecb_fuzzer/BUILD.gn @@ -13,13 +13,13 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("RegNodeDeviceStateCbFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/regnodedevicestatecb_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/regnodedevicestatecb_fuzzer" include_dirs = [ "$dsoftbus_root_path/core/common/include", "$dsoftbus_root_path/interfaces/kits/bus_center", diff --git a/tests/sdk/bus_center/fuzztest/setnodedatachangeflag_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/setnodedatachangeflag_fuzzer/BUILD.gn index 1fdf5ed77..891d2e285 100644 --- a/tests/sdk/bus_center/fuzztest/setnodedatachangeflag_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/setnodedatachangeflag_fuzzer/BUILD.gn @@ -13,13 +13,13 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("SetNodeDataChangeFlagFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/setnodedatachangeflag_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/setnodedatachangeflag_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", diff --git a/tests/sdk/bus_center/fuzztest/shiftlnngear_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/shiftlnngear_fuzzer/BUILD.gn index 44249be5a..a46e3737c 100644 --- a/tests/sdk/bus_center/fuzztest/shiftlnngear_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/shiftlnngear_fuzzer/BUILD.gn @@ -13,13 +13,14 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("ShiftLnnGearFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/shiftlnngear_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/shiftlnngear_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", diff --git a/tests/sdk/bus_center/fuzztest/softbusclientmanager_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/softbusclientmanager_fuzzer/BUILD.gn index a2929de71..a109689d5 100644 --- a/tests/sdk/bus_center/fuzztest/softbusclientmanager_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/softbusclientmanager_fuzzer/BUILD.gn @@ -14,13 +14,13 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("SoftBusClientManagerFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/softbusclientmanager_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/softbusclientmanager_fuzzer" include_dirs = [ "$dsoftbus_root_path/sdk/bus_center/manager/include" ] cflags = [ "-g", diff --git a/tests/sdk/bus_center/fuzztest/starttimesync_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/starttimesync_fuzzer/BUILD.gn index 1a440ed14..43dfa59ac 100644 --- a/tests/sdk/bus_center/fuzztest/starttimesync_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/starttimesync_fuzzer/BUILD.gn @@ -13,13 +13,14 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("StartTimeSyncFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/starttimesync_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/starttimesync_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", diff --git a/tests/sdk/bus_center/fuzztest/stoppublishlnn_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/stoppublishlnn_fuzzer/BUILD.gn index 6ffcbc65b..6e458c66d 100644 --- a/tests/sdk/bus_center/fuzztest/stoppublishlnn_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/stoppublishlnn_fuzzer/BUILD.gn @@ -13,13 +13,14 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("StopPublishLNNFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/stoppublishlnn_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/stoppublishlnn_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", diff --git a/tests/sdk/bus_center/fuzztest/stoprefreshlnn_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/stoprefreshlnn_fuzzer/BUILD.gn index dc1e943a0..eeb0ff6d8 100644 --- a/tests/sdk/bus_center/fuzztest/stoprefreshlnn_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/stoprefreshlnn_fuzzer/BUILD.gn @@ -13,13 +13,14 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("StopRefreshLNNFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/stoprefreshlnn_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/stoprefreshlnn_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", diff --git a/tests/sdk/bus_center/fuzztest/stoptimesync_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/stoptimesync_fuzzer/BUILD.gn index 70393eb7f..010ae4452 100644 --- a/tests/sdk/bus_center/fuzztest/stoptimesync_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/stoptimesync_fuzzer/BUILD.gn @@ -13,13 +13,14 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("StopTimeSyncFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/stoptimesync_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/stoptimesync_fuzzer" include_dirs = [ "$dsoftbus_root_path/adapter/common/include", "$dsoftbus_root_path/core/common/include", diff --git a/tests/sdk/bus_center/fuzztest/stoptimesyncinner_fuzzer/BUILD.gn b/tests/sdk/bus_center/fuzztest/stoptimesyncinner_fuzzer/BUILD.gn index da42dcaa0..25ae2ce76 100755 --- a/tests/sdk/bus_center/fuzztest/stoptimesyncinner_fuzzer/BUILD.gn +++ b/tests/sdk/bus_center/fuzztest/stoptimesyncinner_fuzzer/BUILD.gn @@ -13,13 +13,13 @@ #####################hydra-fuzz################### import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/bus_center" ##############################fuzztest########################################## ohos_fuzztest("StopTimeSyncInnerFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/bus_center/fuzztest/stoptimesyncinner_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/bus_center/fuzztest/stoptimesyncinner_fuzzer" include_dirs = [ "$dsoftbus_root_path/core/common/include", "$dsoftbus_root_path/interfaces/kits/bus_center", diff --git a/tests/sdk/bus_center/unittest/BUILD.gn b/tests/sdk/bus_center/unittest/BUILD.gn index a8ff5c18a..c84716a9e 100644 --- a/tests/sdk/bus_center/unittest/BUILD.gn +++ b/tests/sdk/bus_center/unittest/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") bus_center_sdk_test_src = [ "bus_center_sdk_test.cpp" ] client_bus_center_test_src = [ "client_bus_center_test.cpp" ] @@ -47,9 +47,9 @@ bus_center_sdk_test_deps = [ "$dsoftbus_root_path/core/common:softbus_utils", "$dsoftbus_root_path/core/frame:softbus_server", "$dsoftbus_root_path/sdk:softbus_client", + "../../../../sdk:softbus_client", "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken", "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", - "//foundation/communication/dsoftbus/sdk:softbus_client", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//third_party/bounds_checking_function:libsec_static", ] @@ -163,16 +163,14 @@ if (defined(ohos_lite)) { "//third_party/googletest:gtest_main", ] if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", - ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] + external_deps = [ "hilog:libhilog" ] } + external_deps += [ + "c_utils:utils", + "ipc:ipc_core", + ] } ohos_unittest("ClientBusCenterSdkTest") { @@ -189,16 +187,14 @@ if (defined(ohos_lite)) { "//third_party/googletest:gtest_main", ] if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", - ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] + external_deps = [ "hilog:libhilog" ] } + external_deps += [ + "c_utils:utils", + "ipc:ipc_core", + ] } ohos_unittest("ClientBusMangerTest") { @@ -215,16 +211,14 @@ if (defined(ohos_lite)) { "//third_party/googletest:gtest_main", ] if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", - ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] + external_deps = [ "hilog:libhilog" ] } + external_deps += [ + "c_utils:utils", + "ipc:ipc_core", + ] } ohos_unittest("BusCenterHeartbeatSdkTest") { @@ -241,16 +235,14 @@ if (defined(ohos_lite)) { "//third_party/googletest:gtest_main", ] if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", - ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] + external_deps = [ "hilog:libhilog" ] } + external_deps += [ + "c_utils:utils", + "ipc:ipc_core", + ] } ohos_unittest("BusCenterMetaNodeSdkTest") { @@ -267,16 +259,14 @@ if (defined(ohos_lite)) { "//third_party/googletest:gtest_main", ] if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", - ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] + external_deps = [ "hilog:libhilog" ] } + external_deps += [ + "c_utils:utils", + "ipc:ipc_core", + ] } ohos_unittest("ClientBusCentManagerTest") { @@ -319,16 +309,14 @@ if (defined(ohos_lite)) { "//third_party/googletest:gtest_main", ] if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", - ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } else { - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] + external_deps = [ "hilog:libhilog" ] } + external_deps += [ + "c_utils:utils", + "ipc:ipc_core", + ] } group("unittest") { diff --git a/tests/sdk/common/BUILD.gn b/tests/sdk/common/BUILD.gn index e5fddb075..2019fcd16 100644 --- a/tests/sdk/common/BUILD.gn +++ b/tests/sdk/common/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/lite/config/component/lite_component.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../dsoftbus.gni") if (defined(ohos_lite)) { static_library("softbus_access_token_test") { diff --git a/tests/sdk/discovery/BUILD.gn b/tests/sdk/discovery/BUILD.gn index ecdad4da5..954d2e5f7 100644 --- a/tests/sdk/discovery/BUILD.gn +++ b/tests/sdk/discovery/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../dsoftbus.gni") group("benchmarktest") { testonly = true diff --git a/tests/sdk/discovery/account/BUILD.gn b/tests/sdk/discovery/account/BUILD.gn index 894a67b19..d4d1e74f8 100644 --- a/tests/sdk/discovery/account/BUILD.gn +++ b/tests/sdk/discovery/account/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/discovery" ohos_unittest("disc_account_test") { module_out_path = module_output_path diff --git a/tests/sdk/discovery/benchmarktest/BUILD.gn b/tests/sdk/discovery/benchmarktest/BUILD.gn index 6b7f32e83..70e456939 100644 --- a/tests/sdk/discovery/benchmarktest/BUILD.gn +++ b/tests/sdk/discovery/benchmarktest/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/discovery" ohos_benchmarktest("DiscoveryTest") { module_out_path = module_output_path @@ -30,10 +30,10 @@ ohos_benchmarktest("DiscoveryTest") { "//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", - "//foundation/communication/dsoftbus/sdk:softbus_client", "//third_party/bounds_checking_function:libsec_static", "//third_party/googletest:gtest_main", ] diff --git a/tests/sdk/discovery/fuzztest/discoveryservice_fuzzer/BUILD.gn b/tests/sdk/discovery/fuzztest/discoveryservice_fuzzer/BUILD.gn index 83f04f40b..fc08e4830 100644 --- a/tests/sdk/discovery/fuzztest/discoveryservice_fuzzer/BUILD.gn +++ b/tests/sdk/discovery/fuzztest/discoveryservice_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("DiscoveryServiceFuzzTest") { @@ -23,14 +23,14 @@ ohos_fuzztest("DiscoveryServiceFuzzTest") { fuzz_config_file = "$dsoftbus_root_path/tests/sdk/discovery/fuzztest/discoveryservice_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/discovery", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/sdk/discovery/include", + "../../../../../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", - "//foundation/communication/dsoftbus/sdk/discovery/manager/include", ] cflags = [ "-g", diff --git a/tests/sdk/discovery/mini_test/BUILD.gn b/tests/sdk/discovery/mini_test/BUILD.gn index c7458dc67..4570921a8 100644 --- a/tests/sdk/discovery/mini_test/BUILD.gn +++ b/tests/sdk/discovery/mini_test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/lite/config/component/lite_component.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") static_library("disc_test") { sources = [ "discover_test.c" ] diff --git a/tests/sdk/discovery/unittest/BUILD.gn b/tests/sdk/discovery/unittest/BUILD.gn index ef5400a15..73bbca77a 100644 --- a/tests/sdk/discovery/unittest/BUILD.gn +++ b/tests/sdk/discovery/unittest/BUILD.gn @@ -11,10 +11,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("../../../../dsoftbus.gni") if (defined(ohos_lite)) { import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/test.gni") - import("//foundation/communication/dsoftbus/dsoftbus.gni") if (ohos_build_type == "debug") { unittest("DiscSdkTest") { @@ -34,7 +34,6 @@ if (defined(ohos_lite)) { } } else { import("//build/test.gni") - import("//foundation/communication/dsoftbus/dsoftbus.gni") module_output_path = "dsoftbus/discovery" ohos_unittest("DiscSdkOnlyL2Test") { module_out_path = module_output_path diff --git a/tests/sdk/frame/common/BUILD.gn b/tests/sdk/frame/common/BUILD.gn index fe7a41ed1..a3e0f055b 100644 --- a/tests/sdk/frame/common/BUILD.gn +++ b/tests/sdk/frame/common/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/sdk/transmission/BUILD.gn b/tests/sdk/transmission/BUILD.gn index 3c39997ef..cacb95e58 100644 --- a/tests/sdk/transmission/BUILD.gn +++ b/tests/sdk/transmission/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../dsoftbus.gni") native_source_path = rebase_path("$dsoftbus_root_path") dep_dir = "dsoftbus_enhance/test/sdk/transmission" diff --git a/tests/sdk/transmission/benchmarktest/BUILD.gn b/tests/sdk/transmission/benchmarktest/BUILD.gn index f4733a1d0..f04b23c59 100644 --- a/tests/sdk/transmission/benchmarktest/BUILD.gn +++ b/tests/sdk/transmission/benchmarktest/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/sdk/transmission/fuzztest/clientqosmanager_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/clientqosmanager_fuzzer/BUILD.gn index 86d68bff2..088cf6ef3 100644 --- a/tests/sdk/transmission/fuzztest/clientqosmanager_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/clientqosmanager_fuzzer/BUILD.gn @@ -15,20 +15,20 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" ##############################fuzztest########################################## ohos_fuzztest("ClientQosManagerFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/clientqosmanager_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/clientqosmanager_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/qos/include", - "//foundation/communication/dsoftbus/sdk/transmission/ipc/include", - "//foundation/communication/dsoftbus/sdk/transmission/common/include", - "//foundation/communication/dsoftbus/core/transmission/common/include", + "../../../../../sdk/transmission/trans_channel/qos/include", + "../../../../../sdk/transmission/ipc/include", + "../../../../../sdk/transmission/common/include", + "../../../../../core/transmission/common/include", ] cflags = [ @@ -40,7 +40,7 @@ ohos_fuzztest("ClientQosManagerFuzzTest") { sources = [ "clientqosmanager_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/clienttranschannelcallback_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/clienttranschannelcallback_fuzzer/BUILD.gn index 1f005150e..dd816aff3 100644 --- a/tests/sdk/transmission/fuzztest/clienttranschannelcallback_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/clienttranschannelcallback_fuzzer/BUILD.gn @@ -15,27 +15,27 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" ##############################fuzztest########################################## ohos_fuzztest("ClientTransChannelCallbackFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/clienttranschannelcallback_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/clienttranschannelcallback_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/manager/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/auth/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/proxy/include", - "//foundation/communication/dsoftbus/sdk/transmission/session/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/tcp_direct/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/common/include", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/file/include", - "//foundation/communication/dsoftbus/core/transmission/common/include", + "../../../../../interfaces/kits/transport", + "../../../../../core/common/include", + "../../../../../sdk/transmission/trans_channel/manager/include", + "../../../../../sdk/transmission/trans_channel/auth/include", + "../../../../../sdk/transmission/trans_channel/proxy/include", + "../../../../../sdk/transmission/session/include", + "../../../../../sdk/transmission/trans_channel/tcp_direct/include", + "../../../../../sdk/transmission/trans_channel/udp/common/include", + "../../../../../adapter/common/include", + "../../../../../sdk/transmission/trans_channel/udp/file/include", + "../../../../../core/transmission/common/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] @@ -48,7 +48,7 @@ ohos_fuzztest("ClientTransChannelCallbackFuzzTest") { sources = [ "clienttranschannelcallback_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/clienttransfile_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/clienttransfile_fuzzer/BUILD.gn index d6da964a8..e4846a254 100644 --- a/tests/sdk/transmission/fuzztest/clienttransfile_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/clienttransfile_fuzzer/BUILD.gn @@ -15,24 +15,24 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("ClientTransFileFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/clienttransfile_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/clienttransfile_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/file/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/common/include", - "//foundation/communication/dsoftbus/components/nstackx/nstackx_core/dfile/interface/", - "//foundation/communication/dsoftbus/components/nstackx/nstackx_util/interface", - "//foundation/communication/dsoftbus/sdk/transmission/session/include", + "../../../../../adapter/common/include", + "../../../../../components/nstackx/nstackx_core/dfile/interface/", + "../../../../../components/nstackx/nstackx_util/interface", + "../../../../../core/common/include", + "../../../../../core/common/inner_communication", + "../../../../../interfaces/inner_kits/transport", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/kits/transport", + "../../../../../sdk/transmission/session/include", + "../../../../../sdk/transmission/trans_channel/udp/common/include", + "../../../../../sdk/transmission/trans_channel/udp/file/include", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -45,7 +45,7 @@ ohos_fuzztest("ClientTransFileFuzzTest") { "-fstack-protector-strong", ] sources = [ "clienttransfile_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/clienttranspending_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/clienttranspending_fuzzer/BUILD.gn index f1eb03e7b..a669a66b7 100644 --- a/tests/sdk/transmission/fuzztest/clienttranspending_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/clienttranspending_fuzzer/BUILD.gn @@ -15,19 +15,19 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" ##############################fuzztest########################################## ohos_fuzztest("ClientTransPendingFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/clienttranspending_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/clienttranspending_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/proxy/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/adapter/common/include", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../sdk/transmission/trans_channel/proxy/include", "//third_party/bounds_checking_function/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] @@ -41,7 +41,7 @@ ohos_fuzztest("ClientTransPendingFuzzTest") { sources = [ "clienttranspending_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/clienttransproxyfilecommon_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/clienttransproxyfilecommon_fuzzer/BUILD.gn index 098e7e642..d2661aad2 100644 --- a/tests/sdk/transmission/fuzztest/clienttransproxyfilecommon_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/clienttransproxyfilecommon_fuzzer/BUILD.gn @@ -15,19 +15,19 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" ##############################fuzztest########################################## ohos_fuzztest("ClientTransProxyFileCommonFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/clienttransproxyfilecommon_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/clienttransproxyfilecommon_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/proxy/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/adapter/common/include", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../sdk/transmission/trans_channel/proxy/include", "//third_party/bounds_checking_function/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] @@ -41,7 +41,7 @@ ohos_fuzztest("ClientTransProxyFileCommonFuzzTest") { sources = [ "clienttransproxyfilecommon_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/clienttransproxyfilemanager_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/clienttransproxyfilemanager_fuzzer/BUILD.gn index 1e6aafa7a..537875bd2 100644 --- a/tests/sdk/transmission/fuzztest/clienttransproxyfilemanager_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/clienttransproxyfilemanager_fuzzer/BUILD.gn @@ -15,27 +15,27 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" ##############################fuzztest########################################## ohos_fuzztest("ClientTransProxyFileManagerFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/clienttransproxyfilemanager_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/clienttransproxyfilemanager_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/proxy/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/sdk/transmission/session/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/tcp_direct/include", - "//foundation/communication/dsoftbus/core/transmission/common/include", - "//foundation/communication/dsoftbus/core/connection/interface", - "//foundation/communication/dsoftbus/sdk/transmission/ipc/include", - "//third_party/bounds_checking_function/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/file/include", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../core/connection/interface", + "../../../../../core/transmission/common/include", + "../../../../../sdk/transmission/ipc/include", + "../../../../../sdk/transmission/session/include", + "../../../../../sdk/transmission/trans_channel/proxy/include", + "../../../../../sdk/transmission/trans_channel/tcp_direct/include", + "../../../../../sdk/transmission/trans_channel/udp/file/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "//third_party/bounds_checking_function/include", ] cflags = [ @@ -47,7 +47,7 @@ ohos_fuzztest("ClientTransProxyFileManagerFuzzTest") { sources = [ "clienttransproxyfilemanager_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/clienttransproxymanager_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/clienttransproxymanager_fuzzer/BUILD.gn index e652facb6..ee6d07cef 100644 --- a/tests/sdk/transmission/fuzztest/clienttransproxymanager_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/clienttransproxymanager_fuzzer/BUILD.gn @@ -15,29 +15,28 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" ##############################fuzztest########################################## ohos_fuzztest("ClientTransProxyManagerFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/clienttransproxymanager_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/clienttransproxymanager_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/proxy/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/sdk/transmission/session/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/tcp_direct/include", - "//foundation/communication/dsoftbus/core/transmission/common/include", - "//foundation/communication/dsoftbus/core/connection/interface", - "//foundation/communication/dsoftbus/sdk/transmission/ipc/include", - "//third_party/bounds_checking_function/include", - "//foundation/communication/dsoftbus/core/transmission/common/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/file/include", - "//foundation/communication/dsoftbus/adapter/default_config/spec_config", + "../../../../../adapter/common/include", + "../../../../../adapter/default_config/spec_config", + "../../../../../core/common/include", + "../../../../../core/connection/interface", + "../../../../../core/transmission/common/include", + "../../../../../sdk/transmission/ipc/include", + "../../../../../sdk/transmission/session/include", + "../../../../../sdk/transmission/trans_channel/proxy/include", + "../../../../../sdk/transmission/trans_channel/tcp_direct/include", + "../../../../../sdk/transmission/trans_channel/udp/file/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", + "//third_party/bounds_checking_function/include", ] cflags = [ @@ -49,7 +48,7 @@ ohos_fuzztest("ClientTransProxyManagerFuzzTest") { sources = [ "clienttransproxymanager_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/clienttranssessionmanager_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/clienttranssessionmanager_fuzzer/BUILD.gn index 2a05e41e1..fb26698e5 100644 --- a/tests/sdk/transmission/fuzztest/clienttranssessionmanager_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/clienttranssessionmanager_fuzzer/BUILD.gn @@ -15,22 +15,22 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("ClientTransSessionManagerFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/clienttranssessionmanager_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/clienttranssessionmanager_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../core/common/inner_communication", + "../../../../../core/transmission/common/include", + "../../../../../interfaces/inner_kits/transport", + "../../../../../interfaces/kits/common", + "../../../../../sdk/transmission/session/include", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", - "//foundation/communication/dsoftbus/sdk/transmission/session/include", - "//foundation/communication/dsoftbus/core/transmission/common/include", ] cflags = [ "-g", @@ -39,7 +39,7 @@ ohos_fuzztest("ClientTransSessionManagerFuzzTest") { "-fno-omit-frame-pointer", ] sources = [ "clienttranssessionmanager_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/clienttranssessionservice_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/clienttranssessionservice_fuzzer/BUILD.gn index cdd987b38..20908b93a 100644 --- a/tests/sdk/transmission/fuzztest/clienttranssessionservice_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/clienttranssessionservice_fuzzer/BUILD.gn @@ -15,24 +15,24 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("ClientTransSessionServiceFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/clienttranssessionservice_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/clienttranssessionservice_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/file/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/common/include", - "//foundation/communication/dsoftbus/components/nstackx/nstackx_core/dfile/interface/", - "//foundation/communication/dsoftbus/components/nstackx/nstackx_util/interface", - "//foundation/communication/dsoftbus/sdk/transmission/session/include", + "../../../../../adapter/common/include", + "../../../../../components/nstackx/nstackx_core/dfile/interface/", + "../../../../../components/nstackx/nstackx_util/interface", + "../../../../../core/common/include", + "../../../../../core/common/inner_communication", + "../../../../../interfaces/inner_kits/transport", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/kits/transport", + "../../../../../sdk/transmission/session/include", + "../../../../../sdk/transmission/trans_channel/udp/common/include", + "../../../../../sdk/transmission/trans_channel/udp/file/include", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -44,7 +44,7 @@ ohos_fuzztest("ClientTransSessionServiceFuzzTest") { "-fstack-protector-strong", ] sources = [ "clienttranssessionservice_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/clienttransstream_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/clienttransstream_fuzzer/BUILD.gn index 63c346f39..dc28541e3 100644 --- a/tests/sdk/transmission/fuzztest/clienttransstream_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/clienttransstream_fuzzer/BUILD.gn @@ -15,20 +15,20 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("ClientTransStreamFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/clienttransstream_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/clienttransstream_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/common/include", - "//foundation/communication/dsoftbus/sdk/transmission/session/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/core/transmission/common/include", + "../../../../../adapter/common/include", + "../../../../../interfaces/kits/transport", + "../../../../../sdk/transmission/trans_channel/udp/stream/include", + "../../../../../sdk/transmission/trans_channel/udp/common/include", + "../../../../../sdk/transmission/session/include", + "../../../../../core/common/include", + "../../../../../core/transmission/common/include", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -40,7 +40,7 @@ ohos_fuzztest("ClientTransStreamFuzzTest") { "-fstack-protector-strong", ] sources = [ "clienttransstream_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/clienttranstcpdirectlistener_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/clienttranstcpdirectlistener_fuzzer/BUILD.gn index 26b779394..11697c5ea 100644 --- a/tests/sdk/transmission/fuzztest/clienttranstcpdirectlistener_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/clienttranstcpdirectlistener_fuzzer/BUILD.gn @@ -15,23 +15,23 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("ClientTransTcpDirectListenerFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/clienttranstcpdirectlistener_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/clienttranstcpdirectlistener_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/file/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/common/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/tcp_direct/include", - "//foundation/communication/dsoftbus/sdk/transmission/session/include", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/kits/transport", + "../../../../../interfaces/inner_kits/transport", + "../../../../../sdk/transmission/trans_channel/udp/file/include", + "../../../../../sdk/transmission/trans_channel/udp/common/include", + "../../../../../sdk/transmission/trans_channel/tcp_direct/include", + "../../../../../sdk/transmission/session/include", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -43,7 +43,7 @@ ohos_fuzztest("ClientTransTcpDirectListenerFuzzTest") { "-fstack-protector-strong", ] sources = [ "clienttranstcpdirectlistener_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/clienttransudpmanager_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/clienttransudpmanager_fuzzer/BUILD.gn index f98fef246..d04d74c59 100644 --- a/tests/sdk/transmission/fuzztest/clienttransudpmanager_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/clienttransudpmanager_fuzzer/BUILD.gn @@ -15,23 +15,23 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("ClientTransUdpManagerFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/clienttransudpmanager_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/clienttransudpmanager_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/file/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/common/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/tcp_direct/include", - "//foundation/communication/dsoftbus/sdk/transmission/session/include", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/kits/transport", + "../../../../../interfaces/inner_kits/transport", + "../../../../../sdk/transmission/trans_channel/udp/file/include", + "../../../../../sdk/transmission/trans_channel/udp/common/include", + "../../../../../sdk/transmission/trans_channel/tcp_direct/include", + "../../../../../sdk/transmission/session/include", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -43,7 +43,7 @@ ohos_fuzztest("ClientTransUdpManagerFuzzTest") { "-fstack-protector-strong", ] sources = [ "clienttransudpmanager_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/clienttransudpstreaminterface_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/clienttransudpstreaminterface_fuzzer/BUILD.gn index 9a3d98963..8937c926d 100644 --- a/tests/sdk/transmission/fuzztest/clienttransudpstreaminterface_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/clienttransudpstreaminterface_fuzzer/BUILD.gn @@ -15,19 +15,19 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("ClientTransUdpStreamInterfaceFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/clienttransudpstreaminterface_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/clienttransudpstreaminterface_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/adaptor/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/transmission/common/include", + "../../../../../sdk/transmission/trans_channel/udp/stream/adaptor/include", + "../../../../../interfaces/kits/transport", + "../../../../../core/common/include", + "../../../../../adapter/common/include", + "../../../../../core/transmission/common/include", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -39,7 +39,7 @@ ohos_fuzztest("ClientTransUdpStreamInterfaceFuzzTest") { "-fstack-protector-strong", ] sources = [ "clienttransudpstreaminterface_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/closesession_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/closesession_fuzzer/BUILD.gn index 70a06dffb..a465d79bb 100644 --- a/tests/sdk/transmission/fuzztest/closesession_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/closesession_fuzzer/BUILD.gn @@ -15,18 +15,19 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("CloseSessionFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/closesession_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/closesession_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -39,7 +40,7 @@ ohos_fuzztest("CloseSessionFuzzTest") { ] sources = [ "closesession_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/createsessionserver_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/createsessionserver_fuzzer/BUILD.gn index ca70e01cc..d7ed27508 100644 --- a/tests/sdk/transmission/fuzztest/createsessionserver_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/createsessionserver_fuzzer/BUILD.gn @@ -15,18 +15,18 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("CreateSessionServerFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/createsessionserver_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/createsessionserver_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -39,7 +39,7 @@ ohos_fuzztest("CreateSessionServerFuzzTest") { ] sources = [ "createsessionserver_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/getmysessionname_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/getmysessionname_fuzzer/BUILD.gn index 028375432..e62aab3f7 100644 --- a/tests/sdk/transmission/fuzztest/getmysessionname_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/getmysessionname_fuzzer/BUILD.gn @@ -15,18 +15,18 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("GetMySessionNameFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/getmysessionname_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/getmysessionname_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -39,7 +39,7 @@ ohos_fuzztest("GetMySessionNameFuzzTest") { ] sources = [ "getmysessionname_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/getpeerdeviceid_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/getpeerdeviceid_fuzzer/BUILD.gn index ccf6f876f..b70a0d4ec 100644 --- a/tests/sdk/transmission/fuzztest/getpeerdeviceid_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/getpeerdeviceid_fuzzer/BUILD.gn @@ -15,18 +15,18 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("GetPeerDeviceIdFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/getpeerdeviceid_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/getpeerdeviceid_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -39,7 +39,7 @@ ohos_fuzztest("GetPeerDeviceIdFuzzTest") { ] sources = [ "getpeerdeviceid_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/getpeersessionname_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/getpeersessionname_fuzzer/BUILD.gn index 7990e8494..7c4f7b278 100644 --- a/tests/sdk/transmission/fuzztest/getpeersessionname_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/getpeersessionname_fuzzer/BUILD.gn @@ -15,18 +15,18 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("GetPeerSessionNameFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/getpeersessionname_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/getpeersessionname_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -39,7 +39,7 @@ ohos_fuzztest("GetPeerSessionNameFuzzTest") { ] sources = [ "getpeersessionname_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/getsessionside_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/getsessionside_fuzzer/BUILD.gn index 373c3db9c..c0efb2345 100644 --- a/tests/sdk/transmission/fuzztest/getsessionside_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/getsessionside_fuzzer/BUILD.gn @@ -15,19 +15,19 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("GetSessionSideFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/getsessionside_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/getsessionside_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -40,7 +40,7 @@ ohos_fuzztest("GetSessionSideFuzzTest") { ] sources = [ "getsessionside_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/openauthsession_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/openauthsession_fuzzer/BUILD.gn index 2185c16b5..b2ac136ae 100644 --- a/tests/sdk/transmission/fuzztest/openauthsession_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/openauthsession_fuzzer/BUILD.gn @@ -15,18 +15,18 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("OpenAuthSessionFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/openauthsession_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/openauthsession_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -39,7 +39,7 @@ ohos_fuzztest("OpenAuthSessionFuzzTest") { ] sources = [ "openauthsession_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/opensession_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/opensession_fuzzer/BUILD.gn index d8e5022c6..c971c002e 100644 --- a/tests/sdk/transmission/fuzztest/opensession_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/opensession_fuzzer/BUILD.gn @@ -15,18 +15,19 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("OpenSessionFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/opensession_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/opensession_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -39,7 +40,7 @@ ohos_fuzztest("OpenSessionFuzzTest") { ] sources = [ "opensession_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/qosreport_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/qosreport_fuzzer/BUILD.gn index 52a636f96..f0eab28d5 100644 --- a/tests/sdk/transmission/fuzztest/qosreport_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/qosreport_fuzzer/BUILD.gn @@ -15,19 +15,20 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("QosReportFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/qosreport_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/qosreport_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", - "//foundation/communication/dsoftbus/sdk/transmission/session/include", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", + "../../../../../sdk/transmission/session/include", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -40,7 +41,7 @@ ohos_fuzztest("QosReportFuzzTest") { ] sources = [ "qosreport_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/rawstreamdata_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/rawstreamdata_fuzzer/BUILD.gn index eaa05c2f7..e7f5c23dc 100644 --- a/tests/sdk/transmission/fuzztest/rawstreamdata_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/rawstreamdata_fuzzer/BUILD.gn @@ -15,17 +15,18 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("RawStreamDataFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/rawstreamdata_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/rawstreamdata_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream", + "../../../../../sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/include", + "../../../../../sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/include", + "../../../../../sdk/transmission/trans_channel/udp/stream/libsoftbus_stream", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -37,7 +38,7 @@ ohos_fuzztest("RawStreamDataFuzzTest") { "-fstack-protector-strong", ] sources = [ "rawstreamdata_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/removesessionserver_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/removesessionserver_fuzzer/BUILD.gn index 4419adc74..d3bf406f1 100644 --- a/tests/sdk/transmission/fuzztest/removesessionserver_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/removesessionserver_fuzzer/BUILD.gn @@ -15,18 +15,18 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("RemoveSessionServerFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/removesessionserver_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/removesessionserver_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -39,7 +39,7 @@ ohos_fuzztest("RemoveSessionServerFuzzTest") { ] sources = [ "removesessionserver_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/sendbytes_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/sendbytes_fuzzer/BUILD.gn index f31977367..f52c37659 100644 --- a/tests/sdk/transmission/fuzztest/sendbytes_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/sendbytes_fuzzer/BUILD.gn @@ -15,18 +15,19 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("SendBytesFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/sendbytes_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/sendbytes_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -39,7 +40,7 @@ ohos_fuzztest("SendBytesFuzzTest") { ] sources = [ "sendbytes_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/sendfile_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/sendfile_fuzzer/BUILD.gn index 9c454847d..d45bbf70a 100644 --- a/tests/sdk/transmission/fuzztest/sendfile_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/sendfile_fuzzer/BUILD.gn @@ -15,18 +15,19 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("SendFileFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/sendfile_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/sendfile_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -39,7 +40,7 @@ ohos_fuzztest("SendFileFuzzTest") { ] sources = [ "sendfile_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/sendstream_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/sendstream_fuzzer/BUILD.gn index 5e5221a29..e53de95a7 100644 --- a/tests/sdk/transmission/fuzztest/sendstream_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/sendstream_fuzzer/BUILD.gn @@ -15,18 +15,19 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("SendStreamFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/sendstream_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/sendstream_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -39,7 +40,7 @@ ohos_fuzztest("SendStreamFuzzTest") { ] sources = [ "sendstream_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/sessioncallbackmock_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/sessioncallbackmock_fuzzer/BUILD.gn index 3885ca2ee..6f3d50ad2 100755 --- a/tests/sdk/transmission/fuzztest/sessioncallbackmock_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/sessioncallbackmock_fuzzer/BUILD.gn @@ -15,18 +15,18 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("SessionCallbackMockFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/sessioncallbackmock_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/sessioncallbackmock_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/sdk/transmission/session/cpp/src", - "//foundation/communication/dsoftbus/sdk/transmission/session/cpp/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/dsoftbus/interfaces/kits/common", + "../../../../../sdk/transmission/session/cpp/src", + "../../../../../sdk/transmission/session/cpp/include", + "../../../../../interfaces/kits/transport", + "../../../../../interfaces/kits/common", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -37,7 +37,7 @@ ohos_fuzztest("SessionCallbackMockFuzzTest") { "-fno-omit-frame-pointer", ] sources = [ "sessioncallbackmock_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/sessionimpl_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/sessionimpl_fuzzer/BUILD.gn index 868adbe60..c2eb7e36c 100644 --- a/tests/sdk/transmission/fuzztest/sessionimpl_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/sessionimpl_fuzzer/BUILD.gn @@ -15,21 +15,22 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("SessionImplFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/sessionimpl_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/sessionimpl_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", + "../../../../../sdk/transmission/session/cpp/src", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", - "//foundation/communication/dsoftbus/sdk/transmission/session/cpp/src", ] cflags = [ "-g", @@ -39,7 +40,7 @@ ohos_fuzztest("SessionImplFuzzTest") { "-fstack-protector-strong", ] sources = [ "sessionimpl_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/sessionmock_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/sessionmock_fuzzer/BUILD.gn index 6dc430166..da20937d0 100755 --- a/tests/sdk/transmission/fuzztest/sessionmock_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/sessionmock_fuzzer/BUILD.gn @@ -15,25 +15,26 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("SessionMockFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/sessionmock_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/sessionmock_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/file/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/common/include", - "//foundation/communication/dsoftbus/components/nstackx/nstackx_core/dfile/interface/", - "//foundation/communication/dsoftbus/components/nstackx/nstackx_util/interface", - "//foundation/communication/dsoftbus/sdk/transmission/session/include", - "//foundation/communication/dsoftbus/sdk/transmission/session/cpp/src", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/kits/transport", + "../../../../../interfaces/inner_kits/transport", + "../../../../../sdk/transmission/trans_channel/udp/file/include", + "../../../../../sdk/transmission/trans_channel/udp/common/include", + "../../../../../components/nstackx/nstackx_core/dfile/interface/", + "../../../../../components/nstackx/nstackx_util/interface", + "../../../../../sdk/transmission/session/include", + "../../../../../sdk/transmission/session/cpp/src", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -45,7 +46,7 @@ ohos_fuzztest("SessionMockFuzzTest") { "-fstack-protector-strong", ] sources = [ "sessionmock_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/sessionserviceimpl_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/sessionserviceimpl_fuzzer/BUILD.gn index 20db76d0d..cd166b824 100644 --- a/tests/sdk/transmission/fuzztest/sessionserviceimpl_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/sessionserviceimpl_fuzzer/BUILD.gn @@ -15,22 +15,22 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("SessionServiceImplFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/sessionserviceimpl_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/sessionserviceimpl_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", + "../../../../../sdk/transmission/session/cpp/src", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", - "//foundation/communication/dsoftbus/sdk/transmission/session/cpp/src", ] cflags = [ "-g", @@ -39,7 +39,7 @@ ohos_fuzztest("SessionServiceImplFuzzTest") { "-fno-omit-frame-pointer", ] sources = [ "sessionserviceimpl_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/setfilereceivelistener_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/setfilereceivelistener_fuzzer/BUILD.gn index a72eda61b..15beae4f1 100644 --- a/tests/sdk/transmission/fuzztest/setfilereceivelistener_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/setfilereceivelistener_fuzzer/BUILD.gn @@ -15,18 +15,18 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("SetFileReceiveListenerFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/setfilereceivelistener_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/setfilereceivelistener_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -39,7 +39,7 @@ ohos_fuzztest("SetFileReceiveListenerFuzzTest") { ] sources = [ "setfilereceivelistener_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/setfilesendlistener_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/setfilesendlistener_fuzzer/BUILD.gn index 8d24e40d8..2c1567dc1 100644 --- a/tests/sdk/transmission/fuzztest/setfilesendlistener_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/setfilesendlistener_fuzzer/BUILD.gn @@ -15,18 +15,18 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("SetFileSendListenerFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/setfilesendlistener_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/setfilesendlistener_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -39,7 +39,7 @@ ohos_fuzztest("SetFileSendListenerFuzzTest") { ] sources = [ "setfilesendlistener_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/softbussendmessage_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/softbussendmessage_fuzzer/BUILD.gn index 71c26ecff..9ae01e27d 100644 --- a/tests/sdk/transmission/fuzztest/softbussendmessage_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/softbussendmessage_fuzzer/BUILD.gn @@ -15,18 +15,18 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("SoftBusSendMessageFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/softbussendmessage_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/softbussendmessage_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/inner_kits/transport", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -39,7 +39,7 @@ ohos_fuzztest("SoftBusSendMessageFuzzTest") { ] sources = [ "softbussendmessage_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/streamadaptor_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/streamadaptor_fuzzer/BUILD.gn index a838311bb..c791ac6c3 100644 --- a/tests/sdk/transmission/fuzztest/streamadaptor_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/streamadaptor_fuzzer/BUILD.gn @@ -15,20 +15,21 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("StreamAdaptorFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/streamadaptor_fuzzer" + fuzz_config_file = + "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/streamadaptor_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/adaptor/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/dsoftbus/core/transmission/common/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/include", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", + "../../../../../sdk/transmission/trans_channel/udp/stream/adaptor/include", + "../../../../../interfaces/kits/transport", + "../../../../../core/transmission/common/include", + "../../../../../sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/include", + "../../../../../adapter/common/include", + "../../../../../core/common/include", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -40,7 +41,7 @@ ohos_fuzztest("StreamAdaptorFuzzTest") { "-fstack-protector-strong", ] sources = [ "streamadaptor_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/streamcommondata_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/streamcommondata_fuzzer/BUILD.gn index f292d4720..cbad3a7e7 100644 --- a/tests/sdk/transmission/fuzztest/streamcommondata_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/streamcommondata_fuzzer/BUILD.gn @@ -15,20 +15,20 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("StreamCommonDataFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/streamcommondata_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/streamcommondata_fuzzer" include_dirs = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/include", + "../../../../../sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/include", + "../../../../../sdk/transmission/trans_channel/udp/stream/libsoftbus_stream", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -40,7 +40,7 @@ ohos_fuzztest("StreamCommonDataFuzzTest") { "-fstack-protector-strong", ] sources = [ "streamcommondata_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/streamdepacketizer_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/streamdepacketizer_fuzzer/BUILD.gn index 2c326ac88..7d2bd432a 100644 --- a/tests/sdk/transmission/fuzztest/streamdepacketizer_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/streamdepacketizer_fuzzer/BUILD.gn @@ -15,19 +15,19 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("StreamDepacketizerFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/streamdepacketizer_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/streamdepacketizer_fuzzer" include_dirs = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/include", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../sdk/transmission/trans_channel/udp/stream/libsoftbus_stream", + "../../../../../sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/include", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -39,7 +39,7 @@ ohos_fuzztest("StreamDepacketizerFuzzTest") { "-fstack-protector-strong", ] sources = [ "streamdepacketizer_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/streammsgmanager_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/streammsgmanager_fuzzer/BUILD.gn index 2ccb0499a..d4620bdc6 100644 --- a/tests/sdk/transmission/fuzztest/streammsgmanager_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/streammsgmanager_fuzzer/BUILD.gn @@ -15,19 +15,19 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("StreamMsgManagerFuzzTest") { module_out_path = "dsoftbus/transmission" - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/streammsgmanager_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/streammsgmanager_fuzzer" include_dirs = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/include", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../sdk/transmission/trans_channel/udp/stream/libsoftbus_stream", + "../../../../../sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/include", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -39,7 +39,7 @@ ohos_fuzztest("StreamMsgManagerFuzzTest") { "-fstack-protector-strong", ] sources = [ "streammsgmanager_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/transserverproxyextern_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/transserverproxyextern_fuzzer/BUILD.gn index c2026aeea..6bd59b5dd 100644 --- a/tests/sdk/transmission/fuzztest/transserverproxyextern_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/transserverproxyextern_fuzzer/BUILD.gn @@ -15,29 +15,29 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" ##############################fuzztest########################################## ohos_fuzztest("TransServerProxyExternFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/transserverproxyextern_fuzzer" + fuzz_config_file = "$dsoftbus_root_path/tests/sdk/transmission/fuzztest/transserverproxyextern_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/manager/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/auth/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/proxy/include", - "//foundation/communication/dsoftbus/sdk/transmission/session/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/tcp_direct/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/common/include", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/file/include", - "//foundation/communication/dsoftbus/core/transmission/common/include", + "../../../../../interfaces/kits/transport", + "../../../../../core/common/include", + "../../../../../sdk/transmission/trans_channel/manager/include", + "../../../../../sdk/transmission/trans_channel/auth/include", + "../../../../../sdk/transmission/trans_channel/proxy/include", + "../../../../../sdk/transmission/session/include", + "../../../../../sdk/transmission/trans_channel/tcp_direct/include", + "../../../../../sdk/transmission/trans_channel/udp/common/include", + "../../../../../adapter/common/include", + "../../../../../sdk/transmission/trans_channel/udp/file/include", + "../../../../../core/transmission/common/include", + "../../../../../sdk/transmission/ipc/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/communication/dsoftbus/sdk/transmission/ipc/include", ] cflags = [ @@ -49,7 +49,7 @@ ohos_fuzztest("TransServerProxyExternFuzzTest") { sources = [ "transserverproxyextern_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] } diff --git a/tests/sdk/transmission/fuzztest/vtpstreamsocket_fuzzer/BUILD.gn b/tests/sdk/transmission/fuzztest/vtpstreamsocket_fuzzer/BUILD.gn index b40ad5c4e..b39acbf88 100644 --- a/tests/sdk/transmission/fuzztest/vtpstreamsocket_fuzzer/BUILD.gn +++ b/tests/sdk/transmission/fuzztest/vtpstreamsocket_fuzzer/BUILD.gn @@ -15,31 +15,31 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") ##############################fuzztest########################################## ohos_fuzztest("VtpStreamSocketFuzzTest") { module_out_path = "dsoftbus/transmission" fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/vtpstreamsocket_fuzzer" include_dirs = [ - "//foundation/communication/dsoftbus/core/common/inner_communication", - "//foundation/communication/dsoftbus/adapter/common/include", - "//foundation/communication/dsoftbus/core/common/include", - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/dsoftbus/interfaces/inner_kits/transport", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/file/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/common/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream", - "//foundation/communication/dsoftbus/components/nstackx/nstackx_core/dfile/interface/", - "//foundation/communication/dsoftbus/components/nstackx/nstackx_util/interface", - "//foundation/communication/dsoftbus/sdk/transmission/session/include", - "//foundation/communication/dsoftbus/sdk/transmission/session/cpp/src", - "//foundation/communication/dsoftbus/components/nstackx/fillp/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/include", - "//foundation/communication/dsoftbus/core/transmission/common/include", - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream", + "../../../../../core/common/inner_communication", + "../../../../../adapter/common/include", + "../../../../../core/common/include", + "../../../../../interfaces/kits/common", + "../../../../../interfaces/kits/transport", + "../../../../../interfaces/inner_kits/transport", + "../../../../../sdk/transmission/trans_channel/udp/file/include", + "../../../../../sdk/transmission/trans_channel/udp/common/include", + "../../../../../sdk/transmission/trans_channel/udp/stream/libsoftbus_stream", + "../../../../../components/nstackx/nstackx_core/dfile/interface/", + "../../../../../components/nstackx/nstackx_util/interface", + "../../../../../sdk/transmission/session/include", + "../../../../../sdk/transmission/session/cpp/src", + "../../../../../components/nstackx/fillp/include", + "../../../../../sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/include", + "../../../../../sdk/transmission/trans_channel/udp/stream/include", + "../../../../../core/transmission/common/include", + "../../../../../sdk/transmission/trans_channel/udp/stream/libsoftbus_stream", "//commonlibrary/c_utils/base/include", "//third_party/bounds_checking_function/include", ] @@ -52,7 +52,7 @@ ohos_fuzztest("VtpStreamSocketFuzzTest") { "-DFILLP_LINUX", ] sources = [ "vtpstreamsocket_fuzzer.cpp" ] - deps = [ "//foundation/communication/dsoftbus/sdk:softbus_client" ] + deps = [ "../../../../../sdk:softbus_client" ] external_deps = [ "c_utils:utils" ] diff --git a/tests/sdk/transmission/integration_test/BUILD.gn b/tests/sdk/transmission/integration_test/BUILD.gn index 138498f27..c517b7d4d 100644 --- a/tests/sdk/transmission/integration_test/BUILD.gn +++ b/tests/sdk/transmission/integration_test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/sdk/transmission/ipc/BUILD.gn b/tests/sdk/transmission/ipc/BUILD.gn index 6412e21c9..a5043e0b7 100644 --- a/tests/sdk/transmission/ipc/BUILD.gn +++ b/tests/sdk/transmission/ipc/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" ohos_unittest("TransIpcStandardTest") { diff --git a/tests/sdk/transmission/session/BUILD.gn b/tests/sdk/transmission/session/BUILD.gn index 636abefa2..1a4130100 100644 --- a/tests/sdk/transmission/session/BUILD.gn +++ b/tests/sdk/transmission/session/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/sdk/transmission/trans_channel/BUILD.gn b/tests/sdk/transmission/trans_channel/BUILD.gn index 072ebea17..8018bfd7a 100644 --- a/tests/sdk/transmission/trans_channel/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/BUILD.gn @@ -11,9 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/communication/dsoftbus/dsoftbus.gni") -import( - "//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/trans_udp_sdk.gni") +import("../../../../dsoftbus.gni") +import("../../../../sdk/transmission/trans_channel/udp/trans_udp_sdk.gni") trans_sdk_test_common_inc = [ "$dsoftbus_root_path/core/common/include", diff --git a/tests/sdk/transmission/trans_channel/auth/BUILD.gn b/tests/sdk/transmission/trans_channel/auth/BUILD.gn index be2425c97..e58323eb8 100644 --- a/tests/sdk/transmission/trans_channel/auth/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/auth/BUILD.gn @@ -13,7 +13,7 @@ import("//build/lite/config/component/lite_component.gni") import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" if (defined(ohos_lite)) { diff --git a/tests/sdk/transmission/trans_channel/ble/board/BUILD.gn b/tests/sdk/transmission/trans_channel/ble/board/BUILD.gn index 58028c98d..3597ffd43 100644 --- a/tests/sdk/transmission/trans_channel/ble/board/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/ble/board/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" ohos_unittest("dsoftbus_auth_ble_board") { module_out_path = module_output_path diff --git a/tests/sdk/transmission/trans_channel/ble/phone/BUILD.gn b/tests/sdk/transmission/trans_channel/ble/phone/BUILD.gn index bc908e407..da095acef 100644 --- a/tests/sdk/transmission/trans_channel/ble/phone/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/ble/phone/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" ohos_unittest("dsoftbus_auth_ble_phone") { module_out_path = module_output_path diff --git a/tests/sdk/transmission/trans_channel/br/BUILD.gn b/tests/sdk/transmission/trans_channel/br/BUILD.gn index debaa7631..ad8b172b0 100644 --- a/tests/sdk/transmission/trans_channel/br/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/br/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/connection" diff --git a/tests/sdk/transmission/trans_channel/br/file/BUILD.gn b/tests/sdk/transmission/trans_channel/br/file/BUILD.gn index a854174e8..f58b93c21 100644 --- a/tests/sdk/transmission/trans_channel/br/file/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/br/file/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/connection" diff --git a/tests/sdk/transmission/trans_channel/br/optimization/BUILD.gn b/tests/sdk/transmission/trans_channel/br/optimization/BUILD.gn index e0e015743..9c26087ca 100644 --- a/tests/sdk/transmission/trans_channel/br/optimization/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/br/optimization/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/connection" diff --git a/tests/sdk/transmission/trans_channel/monitor_permission_test/BUILD.gn b/tests/sdk/transmission/trans_channel/monitor_permission_test/BUILD.gn index 84472fe42..1580459f6 100644 --- a/tests/sdk/transmission/trans_channel/monitor_permission_test/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/monitor_permission_test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/sdk/transmission/trans_channel/permission/BUILD.gn b/tests/sdk/transmission/trans_channel/permission/BUILD.gn index b7228ef27..d23d7d940 100644 --- a/tests/sdk/transmission/trans_channel/permission/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/permission/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") if (defined(ohos_lite)) { } else { diff --git a/tests/sdk/transmission/trans_channel/qos/BUILD.gn b/tests/sdk/transmission/trans_channel/qos/BUILD.gn index 36e49ee33..f06014712 100644 --- a/tests/sdk/transmission/trans_channel/qos/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/qos/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/sdk/transmission/trans_channel/tcp_direct/BUILD.gn b/tests/sdk/transmission/trans_channel/tcp_direct/BUILD.gn index eceaae836..91468ccfa 100644 --- a/tests/sdk/transmission/trans_channel/tcp_direct/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/tcp_direct/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/sdk/transmission/trans_channel/udp/distributed_stream/BUILD.gn b/tests/sdk/transmission/trans_channel/udp/distributed_stream/BUILD.gn index a7253a7da..a50d1b679 100644 --- a/tests/sdk/transmission/trans_channel/udp/distributed_stream/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/udp/distributed_stream/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission/stream" diff --git a/tests/sdk/transmission/trans_channel/udp/file/BUILD.gn b/tests/sdk/transmission/trans_channel/udp/file/BUILD.gn index e5485f20a..7b85a071b 100644 --- a/tests/sdk/transmission/trans_channel/udp/file/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/udp/file/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" @@ -20,9 +20,9 @@ if (defined(ohos_lite)) { executable("dsoftbus_app_dfile") { sources = [ "dsoftbus_app_dfile.c" ] include_dirs = [ - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/kits/bus_center", - "//foundation/communication/dsoftbus/interfaces/kits/common", + "../../../../../../interfaces/kits/common", + "../../../../../../interfaces/kits/bus_center", + "../../../../../../interfaces/kits/common", "$dsoftbus_root_path/interfaces/kits/transport", "$dsoftbus_root_path//core/common/include", "//third_party/bounds_checking_function/include", @@ -42,9 +42,9 @@ if (defined(ohos_lite)) { sources = [ "dsoftbus_app_dfile.cpp" ] include_dirs = [ - "//foundation/communication/dsoftbus/interfaces/kits/common", - "//foundation/communication/dsoftbus/interfaces/kits/bus_center", - "//foundation/communication/dsoftbus/interfaces/kits/common", + "../../../../../../interfaces/kits/common", + "../../../../../../interfaces/kits/bus_center", + "../../../../../../interfaces/kits/common", "$dsoftbus_root_path/interfaces/kits/transport", ] diff --git a/tests/sdk/transmission/trans_channel/udp/stream/BUILD.gn b/tests/sdk/transmission/trans_channel/udp/stream/BUILD.gn index dd72fa581..29cdffd64 100644 --- a/tests/sdk/transmission/trans_channel/udp/stream/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/udp/stream/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/lite/config/component/lite_component.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../dsoftbus.gni") config("stream_test") { defines = [ "FILLP_LINUX" ] diff --git a/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/BUILD.gn b/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/BUILD.gn index 2a7b8a42a..0739090d1 100644 --- a/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../../dsoftbus.gni") group("unittest") { if (dsoftbus_feature_trans_udp == true) { diff --git a/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/raw_stream_data_test/BUILD.gn b/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/raw_stream_data_test/BUILD.gn index f0a84749a..4f9c585e3 100644 --- a/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/raw_stream_data_test/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/raw_stream_data_test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/stream_common_data_test/BUILD.gn b/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/stream_common_data_test/BUILD.gn index 1bfa2113f..f9b1d1acf 100644 --- a/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/stream_common_data_test/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/stream_common_data_test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/stream_depacketizer_test/BUILD.gn b/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/stream_depacketizer_test/BUILD.gn index 3ba9a1212..ca1f6eaff 100644 --- a/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/stream_depacketizer_test/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/stream_depacketizer_test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/stream_manager_test/BUILD.gn b/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/stream_manager_test/BUILD.gn index 98d43b71e..353f066be 100644 --- a/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/stream_manager_test/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/stream_manager_test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/vtp_instance_test/BUILD.gn b/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/vtp_instance_test/BUILD.gn index 1886116fa..cb356053c 100644 --- a/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/vtp_instance_test/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/vtp_instance_test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/vtp_stream_socket_test/BUILD.gn b/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/vtp_stream_socket_test/BUILD.gn index 45acb81f2..9930adac1 100644 --- a/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/vtp_stream_socket_test/BUILD.gn +++ b/tests/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/vtp_stream_socket_test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../../../../../../../../dsoftbus.gni") module_output_path = "dsoftbus/transmission" diff --git a/tools/BUILD.gn b/tools/BUILD.gn index e24862957..c3a55b41c 100644 --- a/tools/BUILD.gn +++ b/tools/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/communication/dsoftbus/dsoftbus.gni") +import("../dsoftbus.gni") ohos_executable("SoftBusDumpDeviceInfo") { sources = [ "device_info/get_device_info.c" ]