diff --git a/README_en.md b/README_en.md index 37dc704127079e8d4a440fa6f619b2e36a16379f..a8b30b2fd491a31da644ff47af56a2418809138e 100644 --- a/README_en.md +++ b/README_en.md @@ -21,7 +21,7 @@ The system architecture is shown in the figure below: ## **Directory** ``` -/foundation/distributedhardware/distributedscreen +/foundation/distributedhardware/distributed_screen ├── common # Distributed screen common data definitions, including constants, error codes, logs, tools, and so on ├── interface # Distributed screen SDK, including master side and controlled side service call interface调用接口 ├── sa_profile # SA configuration information for distributed screens diff --git a/README_zh.md b/README_zh.md index 1f385bb5d4b1c22e2cb306e433b8beab8a963f56..55a71d878f51613fbec76e089bff2bb2b6efc809 100644 --- a/README_zh.md +++ b/README_zh.md @@ -24,7 +24,7 @@ ## **目录** ``` -/foundation/distributedhardware/distributedscreen +/foundation/distributedhardware/distributed_screen ├── common # 分布式屏幕公共数据定义，包括常量、错误码、日志、工具等 ├── interface # 分布式屏幕SDK，包含主控端和被控端服务调用接口 ├── sa_profile # 分布式屏幕的SA配置信息 diff --git a/bundle.json b/bundle.json index 11151efc8fd5eb22626db8fb5d6f5b46b0502633..d357bcaa5f7e29f00ddb5b404e76312db2d7178b 100644 --- a/bundle.json +++ b/bundle.json @@ -7,7 +7,7 @@ "license":"Apache License 2.0", "publishAs":"code-segment", "segment":{ - "destPath":"foundation/distributedhardware/distributedscreen/" + "destPath":"foundation/distributedhardware/distributed_screen/" }, "dirs":{}, "scripts":{}, @@ -15,7 +15,7 @@ "name":"distributed_screen", "subsystem":"distributedhardware", "syscap":[ - "SystemCapability.distributedhardware.distributed_screen" + "SystemCapability.DistributedHardware.DistributedScreen" ], "features":[], "adapted_system_type":[ @@ -24,7 +24,7 @@ "rom":"2000k", "ram":"6M", "hisysevent_config": [ - "//foundation/distributedhardware/distributedscreen/hisysevent.yaml" + "//foundation/distributedhardware/distributed_screen/hisysevent.yaml" ], "deps":{ "components":[ @@ -46,25 +46,25 @@ }, "build":{ "sub_component":[ - "//foundation/distributedhardware/distributedscreen/common:distributed_screen_utils", - "//foundation/distributedhardware/distributedscreen/interfaces/innerkits/native_cpp/screen_sink:distributed_screen_sink_sdk", - "//foundation/distributedhardware/distributedscreen/interfaces/innerkits/native_cpp/screen_source:distributed_screen_source_sdk", - "//foundation/distributedhardware/distributedscreen/services/screenclient:distributed_screen_client", - "//foundation/distributedhardware/distributedscreen/screenhandler:distributed_screen_handler", - "//foundation/distributedhardware/distributedscreen/services/screentransport/screensinktrans:distributed_screen_sinktrans", - "//foundation/distributedhardware/distributedscreen/services/screentransport/screensourcetrans:distributed_screen_sourcetrans", - "//foundation/distributedhardware/distributedscreen/services/screenservice/sinkservice:distributed_screen_sink", - "//foundation/distributedhardware/distributedscreen/services/screenservice/sourceservice:distributed_screen_source", - "//foundation/distributedhardware/distributedscreen/sa_profile:dscreen_sa_profile", - "//foundation/distributedhardware/distributedscreen/sa_profile:dscreen.cfg", - "//foundation/distributedhardware/distributedscreen/services/screendemo:distributedScreenTest" + "//foundation/distributedhardware/distributed_screen/common:distributed_screen_utils", + "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/screen_sink:distributed_screen_sink_sdk", + "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/screen_source:distributed_screen_source_sdk", + "//foundation/distributedhardware/distributed_screen/services/screenclient:distributed_screen_client", + "//foundation/distributedhardware/distributed_screen/screenhandler:distributed_screen_handler", + "//foundation/distributedhardware/distributed_screen/services/screentransport/screensinktrans:distributed_screen_sinktrans", + "//foundation/distributedhardware/distributed_screen/services/screentransport/screensourcetrans:distributed_screen_sourcetrans", + "//foundation/distributedhardware/distributed_screen/services/screenservice/sinkservice:distributed_screen_sink", + "//foundation/distributedhardware/distributed_screen/services/screenservice/sourceservice:distributed_screen_source", + "//foundation/distributedhardware/distributed_screen/sa_profile:dscreen_sa_profile", + "//foundation/distributedhardware/distributed_screen/sa_profile:dscreen.cfg", + "//foundation/distributedhardware/distributed_screen/services/screendemo:distributedScreenTest" ], "inner_kits":[ { "type": "so", - "name": "//foundation/distributedhardware/distributedscreen/interfaces/innerkits/native_cpp/screen_sink:distributed_screen_sink_sdk", + "name": "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/screen_sink:distributed_screen_sink_sdk", "header": { - "header_base": "//foundation/distributedhardware/distributedscreen/interfaces/innerkits/native_cpp/screen_sink/include", + "header_base": "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/screen_sink/include", "header_files": [ "idscreen_sink.h" ] @@ -72,9 +72,9 @@ }, { "type": "so", - "name": "//foundation/distributedhardware/distributedscreen/interfaces/innerkits/native_cpp/screen_source:distributed_screen_source_sdk", + "name": "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/screen_source:distributed_screen_source_sdk", "header": { - "header_base": "//foundation/distributedhardware/distributedscreen/interfaces/innerkits/native_cpp/screen_source/include", + "header_base": "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/screen_source/include", "header_files": [ "idscreen_source.h" ] @@ -82,14 +82,14 @@ } ], "test":[ - "//foundation/distributedhardware/distributedscreen/services/screentransport/test/unittest:screen_transport_test", - "//foundation/distributedhardware/distributedscreen/services/softbusadapter/test/unittest:SoftBusAdapterTest", - "//foundation/distributedhardware/distributedscreen/services/common/test/unittest:service_common_test", - "//foundation/distributedhardware/distributedscreen/interfaces/innerkits/native_cpp/test/unittest:screen_interface_test", - "//foundation/distributedhardware/distributedscreen/screenhandler/test/fuzztest:fuzztest", - "//foundation/distributedhardware/distributedscreen/interfaces/innerkits/native_cpp/test/fuzztest:fuzztest", - "//foundation/distributedhardware/distributedscreen/services/softbusadapter/test/fuzztest:fuzztest", - "//foundation/distributedhardware/distributedscreen/services/screentransport/test/fuzztest:fuzztest" + "//foundation/distributedhardware/distributed_screen/services/screentransport/test/unittest:screen_transport_test", + "//foundation/distributedhardware/distributed_screen/services/softbusadapter/test/unittest:SoftBusAdapterTest", + "//foundation/distributedhardware/distributed_screen/services/common/test/unittest:service_common_test", + "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/test/unittest:screen_interface_test", + "//foundation/distributedhardware/distributed_screen/screenhandler/test/fuzztest:fuzztest", + "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/test/fuzztest:fuzztest", + "//foundation/distributedhardware/distributed_screen/services/softbusadapter/test/fuzztest:fuzztest", + "//foundation/distributedhardware/distributed_screen/services/screentransport/test/fuzztest:fuzztest" ] } } diff --git a/common/BUILD.gn b/common/BUILD.gn index 9843f64e4ba029fb33e9edc08e213a75faf20a3c..3396d8c49fb4ce2160c8168927c884106290592f 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ohos_shared_library("distributed_screen_utils") { include_dirs = [ diff --git a/distributedscreen.gni b/distributedscreen.gni index b17f27a67a079d0abae93e684fa197e37051b4ae..219f6f9cf7c8b8fcad660e3e896063936784e695 100644 --- a/distributedscreen.gni +++ b/distributedscreen.gni @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -distributedscreen_path = "//foundation/distributedhardware/distributedscreen" +distributedscreen_path = "//foundation/distributedhardware/distributed_screen" distributedhardwarefwk_path = "//foundation/distributedhardware/distributedhardwarefwk" windowmanager_path = "//foundation/windowmanager" diff --git a/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn index 4d1380c10565135557c0c9befbff2c4b6412e5d9..a85663c55c586eeba176506a691e9438dae41401 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn +++ b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ohos_shared_library("distributed_screen_sink_sdk") { include_dirs = [ diff --git a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn index 5b4a08e54bbbf3bbec89ce7191c6d1448d943c02..61328ad69b844d67b6964d8c7d6f43b1944d92db 100644 --- a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn +++ b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ohos_shared_library("distributed_screen_source_sdk") { include_dirs = [ diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreensinkhandler_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreensinkhandler_fuzzer/BUILD.gn index 7a1b57f8910727763eea32726d51a6c3907661d5..9be51b4fab5df3795b3ffb3c34f215b1708478fa 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreensinkhandler_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreensinkhandler_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("DscreenSinkHandlerFuzzTest") { diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreensinkproxy_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreensinkproxy_fuzzer/BUILD.gn index 43962755096ed12ae967b491acfc6f63ae868fb0..eba246c78d3523c889039b471d4298955cabdaca 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreensinkproxy_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreensinkproxy_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("DscreenSinkProxyFuzzTest") { diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreensourcehandler_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreensourcehandler_fuzzer/BUILD.gn index 7567f729e087174dc394c8f8f8b0aaf55da3027a..b04d3990046a1bbd667d6d7c7d5d4bc21ed0fd44 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreensourcehandler_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreensourcehandler_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("DscreenSourceHandlerFuzzTest") { diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreensourceproxy_fuzzer/BUILD.gn b/interfaces/innerkits/native_cpp/test/fuzztest/dscreensourceproxy_fuzzer/BUILD.gn index 848951530e59e66924e1f2184b8dc3f99aab8662..7585b822163e74b3c0ab09adcc8e3f4e8016e575 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreensourceproxy_fuzzer/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreensourceproxy_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("DscreenSourceProxyFuzzTest") { diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn index b98495045391c626edd347d35bd6020fcb9844f9..191e77f21c9e543f4140033fb8f65525f4d5ad70 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") module_out_path = "distributed_screen/source_trans_test" @@ -50,7 +50,7 @@ ohos_unittest("ScreenSinkTest") { deps = [ "${fwk_utils_path}:distributedhardwareutils", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", - "//foundation/distributedhardware/distributedscreen/interfaces/innerkits/native_cpp/screen_sink:distributed_screen_sink_sdk", + "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/screen_sink:distributed_screen_sink_sdk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn index 5bedfece7e3e041e26fe0c2b87f96e1a450a964b..403753d5b7a870fe4190a57adb4806a7f09f9525 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") module_out_path = "distributed_screen/source_trans_test" @@ -55,7 +55,7 @@ ohos_unittest("ScreenSourceTest") { deps = [ "${fwk_utils_path}:distributedhardwareutils", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", - "//foundation/distributedhardware/distributedscreen/interfaces/innerkits/native_cpp/screen_source:distributed_screen_source_sdk", + "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/screen_source:distributed_screen_source_sdk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index 3927266389f770db48f0b245dbaaadbea074fc59..8fb53209616da066a7aaa1b9cc79c70474690a11 100644 --- a/screenhandler/BUILD.gn +++ b/screenhandler/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ohos_shared_library("distributed_screen_handler") { include_dirs = [ diff --git a/screenhandler/test/fuzztest/dscreenhandler_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/dscreenhandler_fuzzer/BUILD.gn index 0b37ed8e78f8b3048d2bcd1313be220a9037763b..31a687edea0aec4b2f0facce9fc036fb0d2b3fb8 100644 --- a/screenhandler/test/fuzztest/dscreenhandler_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/dscreenhandler_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("DscreenHandlerFuzzTest") { diff --git a/services/common/test/unittest/databuffer/BUILD.gn b/services/common/test/unittest/databuffer/BUILD.gn index 83a66676135d67b7a3cd6922528b06b31f9c287c..89ae6f13980a58c8a1186c540ca853ca88bdc349 100644 --- a/services/common/test/unittest/databuffer/BUILD.gn +++ b/services/common/test/unittest/databuffer/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni") +import( + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") module_out_path = "distributed_screen/services/data_buffer_test" @@ -47,21 +48,19 @@ ohos_unittest("DataBufferTest") { configs = [ ":module_private_config" ] deps = [ - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", "${fwk_utils_path}:distributedhardwareutils", "${graphicstandard_path}/frameworks/surface:surface", "${graphicstandard_path}/rosen/modules/render_service_client:librender_service_client", "${windowmanager_path}/wm:libwm", - "//foundation/distributedhardware/distributedscreen/services/screentransport/screensinktrans:distributed_screen_sinktrans", + "//foundation/distributedhardware/distributed_screen/services/screentransport/screensinktrans:distributed_screen_sinktrans", + "//third_party/googletest:gmock", + "//third_party/googletest:gtest_main", ] - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } group("data_buffer_test") { testonly = true deps = [ ":DataBufferTest" ] -} \ No newline at end of file +} diff --git a/services/common/test/unittest/utils/BUILD.gn b/services/common/test/unittest/utils/BUILD.gn index 609fd72d2d437020e78ad7b05aa859c1fc0a6224..e1fc24e45913c5154c423532e671072e6c5d831b 100644 --- a/services/common/test/unittest/utils/BUILD.gn +++ b/services/common/test/unittest/utils/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni") +import( + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") module_out_path = "distributed_screen/services/utils_test" @@ -42,28 +43,26 @@ ohos_unittest("UtilsTest") { module_out_path = module_out_path sources = [ - "${services_path}/common/test/unittest/utils/video_param_test.cpp", "${services_path}/common/test/unittest/utils/dscreen_maprelation_test.cpp", + "${services_path}/common/test/unittest/utils/video_param_test.cpp", ] configs = [ ":module_private_config" ] deps = [ - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", "${fwk_utils_path}:distributedhardwareutils", "${graphicstandard_path}/frameworks/surface:surface", "${graphicstandard_path}/rosen/modules/render_service_client:librender_service_client", "${windowmanager_path}/wm:libwm", - "//foundation/distributedhardware/distributedscreen/services/screenservice/sinkservice:distributed_screen_sink", + "//foundation/distributedhardware/distributed_screen/services/screenservice/sinkservice:distributed_screen_sink", + "//third_party/googletest:gmock", + "//third_party/googletest:gtest_main", ] - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } group("utils_test") { testonly = true deps = [ ":UtilsTest" ] -} \ No newline at end of file +} diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index b327c968c100c218cc52ccb3039e8f843b264265..8c4c048a272c5a6c7fa15b9ee2a95d4c85bcacf2 100644 --- a/services/screenclient/BUILD.gn +++ b/services/screenclient/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ohos_shared_library("distributed_screen_client") { include_dirs = [ diff --git a/services/screendemo/BUILD.gn b/services/screendemo/BUILD.gn index 98c9f412340ab7a6580afa4486041e854ffd2eca..cde11f08fc1d6ab6e0c023946195ff7276bcfd3f 100644 --- a/services/screendemo/BUILD.gn +++ b/services/screendemo/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ohos_executable("distributedScreenTest") { install_enable = false diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index 6849e2e5fa80effcc6e4c78b43ed2ec71b84180d..b8b3403865df013c700ce6c3f0d7e34f03d48c4e 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ohos_shared_library("distributed_screen_sink") { include_dirs = [ diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 7421c70638ee0ccebc0fd2caa8e34a3842c36194..d6ff0c7cb4c00732402f82a3fceff50c8af8f881 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ohos_shared_library("distributed_screen_source") { include_dirs = [ diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index 34f70156cd045454cf3c3f70704c9d6ca348c96a..3c55da6e0d033c6566d5801d60851b36b36ad1f6 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ohos_shared_library("distributed_screen_sinktrans") { include_dirs = [ diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index 9f77fd7497c4f5132b144bfae366b451acc2419b..71545afab590dfd0ef9b21a507c2d708f547bb05 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ohos_shared_library("distributed_screen_sourcetrans") { include_dirs = [ diff --git a/services/screentransport/test/fuzztest/screendatachannel_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screendatachannel_fuzzer/BUILD.gn index 3e2f845437a7c6ccac679ef7595416b5b2a6441d..1a05432358b736620acb8b73b0df4a388f13af64 100644 --- a/services/screentransport/test/fuzztest/screendatachannel_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screendatachannel_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("ScreenDataChannelFuzzTest") { diff --git a/services/screentransport/test/fuzztest/screensinkprocessor_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensinkprocessor_fuzzer/BUILD.gn index d034995337cc7862e7db37252fe1970775301748..cd15de81e5055ed2ae6d08432ecad772595932ba 100644 --- a/services/screentransport/test/fuzztest/screensinkprocessor_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensinkprocessor_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("ScreenSinkProcessorFuzzTest") { diff --git a/services/screentransport/test/fuzztest/screensinktrans_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensinktrans_fuzzer/BUILD.gn index d1436379f65a32d2107696247f45c89bef5c38c3..9a24012baa7c79b22d636e3d6b34608c3ecf7792 100644 --- a/services/screentransport/test/fuzztest/screensinktrans_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensinktrans_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("ScreenSinkTransFuzzTest") { diff --git a/services/screentransport/test/fuzztest/screensourceprocessor_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor_fuzzer/BUILD.gn index 3682283c601456611c6f35992c147a26234e0776..f565a20b253da7310e56e15c6305a8bc21207130 100644 --- a/services/screentransport/test/fuzztest/screensourceprocessor_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensourceprocessor_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("ScreenSourceProcessorFuzzTest") { diff --git a/services/screentransport/test/fuzztest/screensourcetrans_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourcetrans_fuzzer/BUILD.gn index 60deaaa8b4c86e4ef5f7b1b773d4b7f9ee04067e..6d52b503d8ffa1f05eeaaa1201419ba61c949625 100644 --- a/services/screentransport/test/fuzztest/screensourcetrans_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensourcetrans_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") ##############################fuzztest########################################## ohos_fuzztest("ScreenSourceTransFuzzTest") { diff --git a/services/screentransport/test/unittest/screendatachannel/BUILD.gn b/services/screentransport/test/unittest/screendatachannel/BUILD.gn index afefd636318847f3e22c9f63a5eeb3a1b1cd2b88..9d1a5c9626c81b0e63b80ff1a83f128039235c90 100644 --- a/services/screentransport/test/unittest/screendatachannel/BUILD.gn +++ b/services/screentransport/test/unittest/screendatachannel/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") module_out_path = "distributed_screen/data_channel_test" diff --git a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn index 1bc52832fba12dcf06f0531b8943dd678c2a474c..224aa985e628113423d6170ec6913a3376ad8c27 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn @@ -15,7 +15,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") module_out_path = "distributed_screen/sink_processor_test" diff --git a/services/screentransport/test/unittest/screensinktrans/BUILD.gn b/services/screentransport/test/unittest/screensinktrans/BUILD.gn index 3f4533ae33845d01181c597a01b3ee9d6c493fdd..fd14169ed51a73dd98f24542b4f5cbf37ef19d05 100644 --- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn @@ -15,7 +15,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") module_out_path = "distributed_screen/sink_trans_test" diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn index 15c0bae96eca5be0b9fbad533e1c5b08212c59a4..deb11208bb7dd086b6b349064ce9ee7dbb241e8f 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") module_out_path = "distributed_screen/source_processor_test" diff --git a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn index d81290ed8f3fe1f69b13c38c1ec8472e7d9e6a64..834f4ea58cbed04ab3445b7a39c047589e91a628 100644 --- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") module_out_path = "distributed_screen/source_trans_test" diff --git a/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn b/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn index b8f1cc8173e7acdf4ac419159db2ca03b5eeec9b..93aa139001c6e8d3f435ddf0ab3aadea39f68e95 100644 --- a/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn +++ b/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//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 2ef72f3e47e832d2f66b861f91a918b044fe6238..97cea9cecd3a390b310e4e734a1ca16a561fa446 100644 --- a/services/softbusadapter/test/unittest/BUILD.gn +++ b/services/softbusadapter/test/unittest/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") + "//foundation/distributedhardware/distributed_screen/distributedscreen.gni") module_out_path = "distributed_screen/soft_bus_adapter_test"