From 81227a8dc821680f65a5840fe05aba59fa73199c Mon Sep 17 00:00:00 2001 From: wangpggg Date: Mon, 7 Apr 2025 09:09:51 +0800 Subject: [PATCH] remove path dependency Signed-off-by: wangpeng --- common/test/unittest/BUILD.gn | 2 +- .../dscreensourcecallbackstub_fuzzer/BUILD.gn | 3 ++- .../test/unittest/screensinktest/BUILD.gn | 2 +- .../test/unittest/screensourcetest/BUILD.gn | 2 +- .../test/unittest/screenhandler/BUILD.gn | 2 +- .../test/unittest/src/screen_client_test.cpp | 12 +++++----- services/screendemo/BUILD.gn | 4 ++-- services/screenservice/sinkservice/BUILD.gn | 16 +++++++------- services/screenservice/sourceservice/BUILD.gn | 22 +++++++++---------- .../dscreensinkstub_fuzzer/BUILD.gn | 3 ++- .../dscreenmgr/dscreenmanager_fuzzer/BUILD.gn | 5 +++-- .../BUILD.gn | 3 ++- .../dscreensourceservice_fuzzer/BUILD.gn | 3 ++- .../dscreensourcestub_fuzzer/BUILD.gn | 3 ++- .../sinkservice/dscreenservice/BUILD.gn | 2 +- .../sinkservice/screenregionmgr/BUILD.gn | 2 +- .../sourceservice/dscreenmgr/BUILD.gn | 2 +- .../sourceservice/dscreenservice/BUILD.gn | 4 ++-- .../screentransport/screensinktrans/BUILD.gn | 4 ++-- .../screensourcetrans/BUILD.gn | 5 ++--- .../onerror_fuzzer/BUILD.gn | 3 ++- .../oninputbufferavailable_fuzzer/BUILD.gn | 3 ++- .../onoutputbufferavailable_fuzzer/BUILD.gn | 3 ++- .../onoutputformatchanged_fuzzer/BUILD.gn | 3 ++- .../test/unittest/screendatachannel/BUILD.gn | 2 +- .../unittest/screensinkprocessor/BUILD.gn | 2 +- .../test/unittest/screensinktrans/BUILD.gn | 2 +- .../unittest/screensourceprocessor/BUILD.gn | 2 +- .../test/unittest/screensourcetrans/BUILD.gn | 2 +- .../unittest/screentranstestutils/BUILD.gn | 2 +- .../fuzztest/softbusadapter_fuzzer/BUILD.gn | 3 ++- .../softbusadapter/test/unittest/BUILD.gn | 2 +- 32 files changed, 70 insertions(+), 60 deletions(-) diff --git a/common/test/unittest/BUILD.gn b/common/test/unittest/BUILD.gn index ae2262a9..33dc1c85 100644 --- a/common/test/unittest/BUILD.gn +++ b/common/test/unittest/BUILD.gn @@ -20,7 +20,7 @@ module_out_path = "distributed_screen/distributed_screen/screen_common_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "./include", + "include", "${common_path}/include", ] } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/dscreensourcecallbackstub_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/dscreensourcecallbackstub_fuzzer/BUILD.gn index 047e26f9..02f152b2 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/dscreensourcecallbackstub_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/dscreensourcecallbackstub_fuzzer/BUILD.gn @@ -14,7 +14,8 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("../../../../../../../distributedscreen.gni") +import( + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("DscreenSourceCallbackStubFuzzTest") { diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn index 60154cda..690852e7 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn @@ -20,7 +20,7 @@ module_out_path = "distributed_screen/distributed_screen/source_trans_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "./include", + "include", "${services_path}/screentransport/test/unittest/screentranstestutils/include", "${common_path}/include", "${services_path}/common/databuffer/include", diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn index 290469c5..093ada8d 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn @@ -20,7 +20,7 @@ module_out_path = "distributed_screen/distributed_screen/source_trans_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "./include", + "include", "${common_path}/include", "${interfaces_path}/innerkits/native_cpp/screen_source/include", "${interfaces_path}/innerkits/native_cpp/screen_source/include/callback", diff --git a/screenhandler/test/unittest/screenhandler/BUILD.gn b/screenhandler/test/unittest/screenhandler/BUILD.gn index c2c87336..c30ee6ab 100644 --- a/screenhandler/test/unittest/screenhandler/BUILD.gn +++ b/screenhandler/test/unittest/screenhandler/BUILD.gn @@ -20,7 +20,7 @@ module_out_path = "distributed_screen/distributed_screen/dscreen_handler_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "./include", + "include", "${common_path}/include", "${distributedscreen_path}/screenhandler/include", ] diff --git a/services/screenclient/test/unittest/src/screen_client_test.cpp b/services/screenclient/test/unittest/src/screen_client_test.cpp index 1824510c..2c1dab8b 100644 --- a/services/screenclient/test/unittest/src/screen_client_test.cpp +++ b/services/screenclient/test/unittest/src/screen_client_test.cpp @@ -79,7 +79,7 @@ HWTEST_F(ScreenClientTest, AddWindow_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenClientTest, AddWindow_002, TestSize.Level1) +HWTEST_F(ScreenClientTest, AddWindow_002, TestSize.Level0) { int32_t expectId = ScreenClient::GetInstance().AddWindow(windowProperty_); int32_t ret = ScreenClient::GetInstance().RemoveWindow(expectId); @@ -104,7 +104,7 @@ HWTEST_F(ScreenClientTest, ShowWindow_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenClientTest, ShowWindow_002, TestSize.Level1) +HWTEST_F(ScreenClientTest, ShowWindow_002, TestSize.Level0) { int32_t windowId = ScreenClient::GetInstance().AddWindow(windowProperty_); int32_t ret = ScreenClient::GetInstance().ShowWindow(windowId); @@ -147,7 +147,7 @@ HWTEST_F(ScreenClientTest, HideWindow_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenClientTest, HideWindow_002, TestSize.Level1) +HWTEST_F(ScreenClientTest, HideWindow_002, TestSize.Level0) { int32_t windowId = ScreenClient::GetInstance().AddWindow(windowProperty_); int32_t ret = ScreenClient::GetInstance().HideWindow(windowId); @@ -190,7 +190,7 @@ HWTEST_F(ScreenClientTest, MoveWindow_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenClientTest, MoveWindow_002, TestSize.Level1) +HWTEST_F(ScreenClientTest, MoveWindow_002, TestSize.Level0) { int32_t windowId = ScreenClient::GetInstance().AddWindow(windowProperty_); int32_t ret = ScreenClient::GetInstance().MoveWindow(windowId, 0, 0); @@ -233,7 +233,7 @@ HWTEST_F(ScreenClientTest, RemoveWindow_001, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenClientTest, RemoveWindow_002, TestSize.Level1) +HWTEST_F(ScreenClientTest, RemoveWindow_002, TestSize.Level0) { int32_t windowId = ScreenClient::GetInstance().AddWindow(windowProperty_); int32_t ret = ScreenClient::GetInstance().RemoveWindow(windowId); @@ -286,7 +286,7 @@ HWTEST_F(ScreenClientTest, GetSurface_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: Issue Number */ -HWTEST_F(ScreenClientTest, DestroyAllWindow_001, TestSize.Level1) +HWTEST_F(ScreenClientTest, DestroyAllWindow_001, TestSize.Level0) { ScreenClient::GetInstance().AddWindow(windowProperty_); int32_t ret = ScreenClient::GetInstance().DestroyAllWindow(); diff --git a/services/screendemo/BUILD.gn b/services/screendemo/BUILD.gn index e432b064..26dbefa9 100644 --- a/services/screendemo/BUILD.gn +++ b/services/screendemo/BUILD.gn @@ -33,8 +33,8 @@ ohos_executable("distributedScreenTest") { ] sources = [ - "./decoder_demo.cpp", - "./test.cpp", + "decoder_demo.cpp", + "test.cpp", ] deps = [ diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index aff95a13..21c2af5f 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -27,7 +27,7 @@ ohos_shared_library("distributed_screen_sink") { } branch_protector_ret = "pac_ret" include_dirs = [ - "./dscreenservice/include", + "dscreenservice/include", "${services_path}/screenservice/sinkservice/screenregionmgr", "${interfaces_path}/innerkits/native_cpp/screen_sink/include", "${interfaces_path}/innerkits/native_cpp/screen_sink/include/callback", @@ -50,13 +50,13 @@ ohos_shared_library("distributed_screen_sink") { "${services_path}/common/utils/src/dscreen_hidumper.cpp", "${services_path}/common/utils/src/dscreen_maprelation.cpp", "${services_path}/common/utils/src/video_param.cpp", - "./dscreenservice/src/dscreen_sink_service.cpp", - "./dscreenservice/src/dscreen_sink_stub.cpp", - "./screenregionmgr/1.0/src/screenregion.cpp", - "./screenregionmgr/1.0/src/screenregionmgr.cpp", - "./screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp", - "./screenregionmgr/2.0/src/screenregion.cpp", - "./screenregionmgr/2.0/src/screenregionmgr.cpp", + "dscreenservice/src/dscreen_sink_service.cpp", + "dscreenservice/src/dscreen_sink_stub.cpp", + "screenregionmgr/1.0/src/screenregion.cpp", + "screenregionmgr/1.0/src/screenregionmgr.cpp", + "screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp", + "screenregionmgr/2.0/src/screenregion.cpp", + "screenregionmgr/2.0/src/screenregionmgr.cpp", ] deps = [ diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 64b399f1..2c507831 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -27,8 +27,8 @@ ohos_shared_library("distributed_screen_source") { } branch_protector_ret = "pac_ret" include_dirs = [ - "./dscreenservice/include", - "./dscreenservice/include/callback", + "dscreenservice/include", + "dscreenservice/include/callback", "${services_path}/screenservice/sourceservice/dscreenmgr", "${services_path}/screenservice/sourceservice/dscreenmgr/common/include", "${interfaces_path}/innerkits/native_cpp/screen_sink/include", @@ -53,15 +53,15 @@ ohos_shared_library("distributed_screen_source") { "${services_path}/common/utils/src/dscreen_hidumper.cpp", "${services_path}/common/utils/src/dscreen_maprelation.cpp", "${services_path}/common/utils/src/video_param.cpp", - "./dscreenmgr/1.0/src/dscreen.cpp", - "./dscreenmgr/1.0/src/dscreen_manager.cpp", - "./dscreenmgr/2.0/src/av_sender_engine_adapter.cpp", - "./dscreenmgr/2.0/src/dscreen.cpp", - "./dscreenmgr/2.0/src/dscreen_manager.cpp", - "./dscreenmgr/common/src/screen_manager_adapter.cpp", - "./dscreenservice/src/callback/dscreen_source_callback_proxy.cpp", - "./dscreenservice/src/dscreen_source_service.cpp", - "./dscreenservice/src/dscreen_source_stub.cpp", + "dscreenmgr/1.0/src/dscreen.cpp", + "dscreenmgr/1.0/src/dscreen_manager.cpp", + "dscreenmgr/2.0/src/av_sender_engine_adapter.cpp", + "dscreenmgr/2.0/src/dscreen.cpp", + "dscreenmgr/2.0/src/dscreen_manager.cpp", + "dscreenmgr/common/src/screen_manager_adapter.cpp", + "dscreenservice/src/callback/dscreen_source_callback_proxy.cpp", + "dscreenservice/src/dscreen_source_service.cpp", + "dscreenservice/src/dscreen_source_stub.cpp", ] deps = [ diff --git a/services/screenservice/test/fuzztest/sinkservice/dscreenservice/dscreensinkstub_fuzzer/BUILD.gn b/services/screenservice/test/fuzztest/sinkservice/dscreenservice/dscreensinkstub_fuzzer/BUILD.gn index 9cb3ee8a..bffcd106 100644 --- a/services/screenservice/test/fuzztest/sinkservice/dscreenservice/dscreensinkstub_fuzzer/BUILD.gn +++ b/services/screenservice/test/fuzztest/sinkservice/dscreenservice/dscreensinkstub_fuzzer/BUILD.gn @@ -14,7 +14,8 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("../../../../../../../distributedscreen.gni") +import( + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("DscreenSinkStubFuzzTest") { diff --git a/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/dscreenmanager_fuzzer/BUILD.gn b/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/dscreenmanager_fuzzer/BUILD.gn index d6f3e04f..ffaf9cf3 100644 --- a/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/dscreenmanager_fuzzer/BUILD.gn +++ b/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/dscreenmanager_fuzzer/BUILD.gn @@ -14,7 +14,8 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("../../../../../../../distributedscreen.gni") +import( + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("DScreenManagerFuzzTest") { @@ -23,7 +24,7 @@ ohos_fuzztest("DScreenManagerFuzzTest") { fuzz_config_file = "${services_path}/screenservice/test/fuzztest/sourceservice/dscreenmgr/dscreenmanager_fuzzer" include_dirs = [ - "./dscreenservice/include/callback", + "dscreenservice/include/callback", "${common_path}/include", "${interfaces_path}/innerkits/native_cpp/screen_sink/include", "${interfaces_path}/innerkits/native_cpp/screen_sink/include/callback", diff --git a/services/screenservice/test/fuzztest/sourceservice/dscreenservice/dscreensourcecallbackproxy_fuzzer/BUILD.gn b/services/screenservice/test/fuzztest/sourceservice/dscreenservice/dscreensourcecallbackproxy_fuzzer/BUILD.gn index a3b89ff9..40f1ffcc 100644 --- a/services/screenservice/test/fuzztest/sourceservice/dscreenservice/dscreensourcecallbackproxy_fuzzer/BUILD.gn +++ b/services/screenservice/test/fuzztest/sourceservice/dscreenservice/dscreensourcecallbackproxy_fuzzer/BUILD.gn @@ -14,7 +14,8 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("../../../../../../../distributedscreen.gni") +import( + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("DscreenSourceCallbackProxyFuzzTest") { diff --git a/services/screenservice/test/fuzztest/sourceservice/dscreenservice/dscreensourceservice_fuzzer/BUILD.gn b/services/screenservice/test/fuzztest/sourceservice/dscreenservice/dscreensourceservice_fuzzer/BUILD.gn index 6bf5720d..26553df5 100644 --- a/services/screenservice/test/fuzztest/sourceservice/dscreenservice/dscreensourceservice_fuzzer/BUILD.gn +++ b/services/screenservice/test/fuzztest/sourceservice/dscreenservice/dscreensourceservice_fuzzer/BUILD.gn @@ -14,7 +14,8 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("../../../../../../../distributedscreen.gni") +import( + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("DscreenSourceServiceFuzzTest") { diff --git a/services/screenservice/test/fuzztest/sourceservice/dscreenservice/dscreensourcestub_fuzzer/BUILD.gn b/services/screenservice/test/fuzztest/sourceservice/dscreenservice/dscreensourcestub_fuzzer/BUILD.gn index 503975ed..c1516450 100644 --- a/services/screenservice/test/fuzztest/sourceservice/dscreenservice/dscreensourcestub_fuzzer/BUILD.gn +++ b/services/screenservice/test/fuzztest/sourceservice/dscreenservice/dscreensourcestub_fuzzer/BUILD.gn @@ -14,7 +14,8 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("../../../../../../../distributedscreen.gni") +import( + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("DscreenSourceStubFuzzTest") { diff --git a/services/screenservice/test/unittest/sinkservice/dscreenservice/BUILD.gn b/services/screenservice/test/unittest/sinkservice/dscreenservice/BUILD.gn index e3c5d066..a4c32e82 100644 --- a/services/screenservice/test/unittest/sinkservice/dscreenservice/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/dscreenservice/BUILD.gn @@ -21,7 +21,7 @@ module_out_path = config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "./include", + "include", "${common_path}/include", "${interfaces_path}/innerkits/native_cpp/screen_sink/include", "${interfaces_path}/innerkits/native_cpp/screen_sink/include/callback", diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index 0eea64ba..1e248bce 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -21,7 +21,7 @@ module_out_path = config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "./include", + "include", "${interfaces_path}/innerkits/native_cpp/screen_sink/include", "${interfaces_path}/innerkits/native_cpp/screen_sink/include/callback", "${interfaces_path}/innerkits/native_cpp/screen_source/include", diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn index 81816f01..ff2dcb9a 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -20,7 +20,7 @@ module_out_path = "distributed_screen/distributed_screen/DscreenMgrTest" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "./include", + "include", "${common_path}/include", "${distributedscreen_path}/interfaces/innerkits/native_cpp/screen_sink/include", "${distributedscreen_path}/interfaces/innerkits/native_cpp/screen_sink/include/callback", diff --git a/services/screenservice/test/unittest/sourceservice/dscreenservice/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenservice/BUILD.gn index c5b506d0..03843170 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenservice/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenservice/BUILD.gn @@ -21,8 +21,8 @@ module_out_path = config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "./include", - "./include/callback", + "include", + "include/callback", "${common_path}/include", "${distributedscreen_path}/interfaces/innerkits/native_cpp/screen_sink/include", "${distributedscreen_path}/interfaces/innerkits/native_cpp/screen_source/include", diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index 309a76e7..f94472c7 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -28,7 +28,7 @@ ohos_shared_library("distributed_screen_sinktrans") { branch_protector_ret = "pac_ret" include_dirs = [ - "./include", + "include", "${common_path}/include", "${services_path}/common/databuffer/include", "${services_path}/common/imageJpeg/include", @@ -53,7 +53,7 @@ ohos_shared_library("distributed_screen_sinktrans") { "${services_path}/screentransport/screensinkprocessor/decoder/src/image_sink_decoder.cpp", "${services_path}/screentransport/screensinkprocessor/src/image_sink_processor.cpp", "${services_path}/softbusadapter/src/softbus_adapter.cpp", - "./src/screen_sink_trans.cpp", + "src/screen_sink_trans.cpp", ] deps = [ "${common_path}:distributed_screen_utils" ] diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index 62a3438d..7b7e10b8 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -28,8 +28,7 @@ ohos_shared_library("distributed_screen_sourcetrans") { branch_protector_ret = "pac_ret" include_dirs = [ - "${services_path}/common/utils/include", - "./include", + "include", "${common_path}/include", "${services_path}/common/databuffer/include", "${services_path}/common/screen_channel/include", @@ -53,7 +52,7 @@ ohos_shared_library("distributed_screen_sourcetrans") { "${services_path}/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp", "${services_path}/screentransport/screensourceprocessor/src/image_source_processor.cpp", "${services_path}/softbusadapter/src/softbus_adapter.cpp", - "./src/screen_source_trans.cpp", + "src/screen_source_trans.cpp", ] deps = [ "${common_path}:distributed_screen_utils" ] diff --git a/services/screentransport/test/fuzztest/screensourceprocessor/onerror_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor/onerror_fuzzer/BUILD.gn index ea51f259..71c78ad8 100644 --- a/services/screentransport/test/fuzztest/screensourceprocessor/onerror_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensourceprocessor/onerror_fuzzer/BUILD.gn @@ -14,7 +14,8 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("../../../../../../distributedscreen.gni") +import( + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("OnErrorFuzzTest") { diff --git a/services/screentransport/test/fuzztest/screensourceprocessor/oninputbufferavailable_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor/oninputbufferavailable_fuzzer/BUILD.gn index a7752d8c..9e85bae7 100644 --- a/services/screentransport/test/fuzztest/screensourceprocessor/oninputbufferavailable_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensourceprocessor/oninputbufferavailable_fuzzer/BUILD.gn @@ -14,7 +14,8 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("../../../../../../distributedscreen.gni") +import( + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("OnInputBufferAvailableFuzzTest") { diff --git a/services/screentransport/test/fuzztest/screensourceprocessor/onoutputbufferavailable_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor/onoutputbufferavailable_fuzzer/BUILD.gn index 3d0a8b5a..f1a645b7 100644 --- a/services/screentransport/test/fuzztest/screensourceprocessor/onoutputbufferavailable_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensourceprocessor/onoutputbufferavailable_fuzzer/BUILD.gn @@ -14,7 +14,8 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("../../../../../../distributedscreen.gni") +import( + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("OnOutputBufferAvailableFuzzTest") { diff --git a/services/screentransport/test/fuzztest/screensourceprocessor/onoutputformatchanged_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor/onoutputformatchanged_fuzzer/BUILD.gn index b723e739..554c2405 100644 --- a/services/screentransport/test/fuzztest/screensourceprocessor/onoutputformatchanged_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensourceprocessor/onoutputformatchanged_fuzzer/BUILD.gn @@ -14,7 +14,8 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("../../../../../../distributedscreen.gni") +import( + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("OnOutputFormatChangedFuzzTest") { diff --git a/services/screentransport/test/unittest/screendatachannel/BUILD.gn b/services/screentransport/test/unittest/screendatachannel/BUILD.gn index 9e4a7aa5..d37328f7 100644 --- a/services/screentransport/test/unittest/screendatachannel/BUILD.gn +++ b/services/screentransport/test/unittest/screendatachannel/BUILD.gn @@ -20,7 +20,7 @@ module_out_path = "distributed_screen/distributed_screen/data_channel_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "./include", + "include", "${common_path}/include", "${services_path}/common/databuffer/include", "${services_path}/common/decision_center/include", diff --git a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn index 73e4643b..0e2d3184 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn @@ -22,7 +22,7 @@ module_out_path = "distributed_screen/distributed_screen/sink_processor_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "./include", + "include", "${common_path}/include", "${services_path}/common/databuffer/include", "${services_path}/common/imageJpeg/include", diff --git a/services/screentransport/test/unittest/screensinktrans/BUILD.gn b/services/screentransport/test/unittest/screensinktrans/BUILD.gn index f584e7f0..819fbebc 100644 --- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn @@ -22,7 +22,7 @@ module_out_path = "distributed_screen/distributed_screen/sink_trans_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "./include", + "include", "${common_path}/include", "${services_path}/common/databuffer/include", "${services_path}/common/imageJpeg/include", diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn index d1607980..befabb76 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn @@ -20,7 +20,7 @@ module_out_path = "distributed_screen/distributed_screen/source_processor_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "./include", + "include", "${services_path}/screentransport/test/unittest/screentranstestutils/include", "${common_path}/include", "${services_path}/common/databuffer/include", diff --git a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn index eee7c93a..d87e368e 100644 --- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn @@ -20,7 +20,7 @@ module_out_path = "distributed_screen/distributed_screen/source_trans_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "./include", + "include", "${common_path}/include", "${services_path}/common/databuffer/include", "${services_path}/common/decision_center/include", diff --git a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn index be61276a..ee327bbd 100644 --- a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn +++ b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn @@ -20,7 +20,7 @@ module_out_path = "distributed_screen/distributed_screen/screen_callback_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "./include", + "include", "${services_path}/screentransport/test/unittest/screentranstestutils/include", "${common_path}/include", "${services_path}/common/databuffer/include", diff --git a/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn b/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn index 1f4510b7..538bb0fd 100644 --- a/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn +++ b/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn @@ -14,7 +14,8 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("../../../../../distributedscreen.gni") +import( + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("SoftbusAdapterFuzzTest") { diff --git a/services/softbusadapter/test/unittest/BUILD.gn b/services/softbusadapter/test/unittest/BUILD.gn index e100b02d..e9777b16 100644 --- a/services/softbusadapter/test/unittest/BUILD.gn +++ b/services/softbusadapter/test/unittest/BUILD.gn @@ -20,7 +20,7 @@ module_out_path = "distributed_screen/distributed_screen/soft_bus_adapter_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "./include", + "include", "${common_path}/include", "${services_path}/common/databuffer/include", "${services_path}/common/screen_channel/include", -- Gitee