diff --git a/common/test/unittest/BUILD.gn b/common/test/unittest/BUILD.gn index ae2262a9b0ef1aafaa09f0e2fc54ab211514c184..33dc1c850f76dc5119e3af2fb4cbf071cab5ee66 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 047e26f927fd790903921ad2db4e34deb12fbc2e..02f152b2494ddf9ecbdeafc678fd99f57218925a 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 60154cdac4f865a70b55e1f5b87853f9f3eeadaf..690852e7b1efc527a87f7269a9f49ec62f88fbd0 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 290469c5aed6c51179e806048ceb9630c71d5f50..093ada8d61a7f4b89647e03f107d371368d4e1e4 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 c2c87336df73ab3bf73188bb23243478e30aa68e..c30ee6abb73bdf6be7b3b7708eec586174153e01 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 1824510cc74e2c5e2155c2fc4bb0f25e31e5a9da..2c1dab8bcbda35f17494a9dab9e456bfbd47f768 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 e432b06480d7880e83d8d5b009b0cfdac91f7058..26dbefa9bf7fd31c7589ad0094bb24e255f75312 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 aff95a13b0b1eaf1bf181bdb4cd5fcc1310898e4..21c2af5fa4b769f58e71861010b5624b7ac2a7f9 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 64b399f1d9a25aaaaa67680d477f2d96870727ad..2c5078319a7161208f950ea28b0a678d053bb1a6 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 9cb3ee8a8be16208ff7e8150533da33771babc91..bffcd106921d49a55b6d3d476263c58d97b92720 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 d6f3e04f5ec8a9e12a1b548469fbb1dbbb9a767d..ffaf9cf343c99f1c465cebbdc7b156928dd31189 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 a3b89ff981af3da4a26cde4853a4f7eaae513354..40f1ffccfabb7a4419efbfb3da9f7abe01a8cfc1 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 6bf5720d108e788261e8ee73896a74f5ad1bb226..26553df5f475ad16cd1d23eeced5e8241326e33e 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 503975ed4eb6607e69c0f10bb8ba102131e6abd6..c151645083aa178c63256e9cae98714ea25b6c23 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 e3c5d066abbde06c8a4e9455bf75f99baeac0473..a4c32e8213b7b650786b65e6f22b855dcb76a544 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 0eea64bab5f2d2a40e9eb617a3fef320e2bcc192..1e248bce29cfcc9d1af2eed497c9ac50749fccdb 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 81816f013ad47cb1e91c6215ed855c8022aae4ea..ff2dcb9a19d57c39a7b405fdc46d3c84742e724e 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 c5b506d09162135f03bd0c4b475b5b253d35a3d6..038431702a2cd5f0bb7de81d649b1d589cb715b1 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 309a76e7f236aaf9dce4b32fcf2a9e77aeb7af0f..f94472c7f49dc3b8de755d5586f6d6acfa3b39bc 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 62a3438d5a6840aaa01788c99ca44d9a6a8e0f00..7b7e10b81fe7cdbd91dc724c6585dfea3ff3b80e 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 ea51f2595f5c546a7eecd2138d8b488bb388c226..71c78ad8a0f888c37f98dd2bf9841348d32257bc 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 a7752d8c2a5baad99de9d8e2efe1369cf30662dd..9e85bae7107e1144aad414a66e64b7298c7564bf 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 3d0a8b5a17cdf84bbb278001fe2addfd8f1a8e52..f1a645b70416455421830e627deb666acc2b82b3 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 b723e7396dbdd2c600e3a6c58d6e32901722ca1d..554c240501e9f8fe6e2bc3bd1b7bb6c257d7a2e8 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 9e4a7aa5723457656c22a958502755741575f602..d37328f758dd9397e415ffac3489e50d68c4a87c 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 73e4643b8082a9b683cfe76140dab9f3a244d18f..0e2d31849778d2e53658b53ca97dc9a6363cf70d 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 f584e7f09f43dbe5798ff665defdf32db6238108..819fbebc969c6ce54608519749d6cdc84868e168 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 d1607980146297032af7e36d7f1e5e0fe6bba5bb..befabb7654ca992ea2f39739d88b3eef36f89377 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 eee7c93a6b212f09ab16f9da30125c6823da3fbb..d87e368e578890c305fa7d8d8c35c7f1e25295ca 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 be61276a5dc0f6e7a3280bdf0b9ca2c9a50d93e3..ee327bbde0a097e2c6ac6ec7e45bf2e541493339 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 1f4510b7f10dfa850c6106fa63aa66a4c031d948..538bb0fd7f503518c2440b175ceb23cf9de81017 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 e100b02d34e973cac6a85a08bcd43e4147dab29c..e9777b16db6a23d1e693c185f4d99d0c1eeb8b62 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",