From d8a3c16ca5ce1f9ab38666c79e325df4cad16b5d Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Tue, 7 Jun 2022 16:33:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E5=B1=8F?= =?UTF-8?q?=E5=B9=95=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- README_en.md | 2 +- README_zh.md | 2 +- bundle.json | 52 +++++++++---------- common/BUILD.gn | 2 +- distributedscreen.gni | 2 +- .../innerkits/native_cpp/screen_sink/BUILD.gn | 2 +- .../native_cpp/screen_source/BUILD.gn | 2 +- .../dscreensinkhandler_fuzzer/BUILD.gn | 2 +- .../fuzztest/dscreensinkproxy_fuzzer/BUILD.gn | 2 +- .../dscreensourcehandler_fuzzer/BUILD.gn | 2 +- .../dscreensourceproxy_fuzzer/BUILD.gn | 2 +- .../test/unittest/screensinktest/BUILD.gn | 4 +- .../test/unittest/screensourcetest/BUILD.gn | 4 +- screenhandler/BUILD.gn | 2 +- .../fuzztest/dscreenhandler_fuzzer/BUILD.gn | 2 +- .../common/test/unittest/databuffer/BUILD.gn | 4 +- services/common/test/unittest/utils/BUILD.gn | 4 +- services/screenclient/BUILD.gn | 2 +- services/screendemo/BUILD.gn | 2 +- services/screenservice/sinkservice/BUILD.gn | 2 +- services/screenservice/sourceservice/BUILD.gn | 2 +- .../screentransport/screensinktrans/BUILD.gn | 2 +- .../screensourcetrans/BUILD.gn | 2 +- .../screendatachannel_fuzzer/BUILD.gn | 2 +- .../screensinkprocessor_fuzzer/BUILD.gn | 2 +- .../fuzztest/screensinktrans_fuzzer/BUILD.gn | 2 +- .../screensourceprocessor_fuzzer/BUILD.gn | 2 +- .../screensourcetrans_fuzzer/BUILD.gn | 2 +- .../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 +- .../fuzztest/softbusadapter_fuzzer/BUILD.gn | 2 +- .../softbusadapter/test/unittest/BUILD.gn | 2 +- 35 files changed, 64 insertions(+), 64 deletions(-) diff --git a/README_en.md b/README_en.md index 37dc7041..a8b30b2f 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 1f385bb5..55a71d87 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 11151efc..4c300b29 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":{}, @@ -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 9843f64e..3396d8c4 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 b17f27a6..219f6f9c 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 4d1380c1..a85663c5 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 5b4a08e5..61328ad6 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 7a1b57f8..9be51b4f 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 43962755..eba246c7 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 7567f729..b04d3990 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 84895153..7585b822 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 b9849504..191e77f2 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 5bedfece..403753d5 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 39272663..8fb53209 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 0b37ed8e..31a687ed 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 83a66676..6ec3ed09 100644 --- a/services/common/test/unittest/databuffer/BUILD.gn +++ b/services/common/test/unittest/databuffer/BUILD.gn @@ -12,7 +12,7 @@ # 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" @@ -53,7 +53,7 @@ ohos_unittest("DataBufferTest") { "${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", ] external_deps = [ diff --git a/services/common/test/unittest/utils/BUILD.gn b/services/common/test/unittest/utils/BUILD.gn index 609fd72d..42f8e8f1 100644 --- a/services/common/test/unittest/utils/BUILD.gn +++ b/services/common/test/unittest/utils/BUILD.gn @@ -12,7 +12,7 @@ # 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" @@ -55,7 +55,7 @@ ohos_unittest("UtilsTest") { "${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", ] external_deps = [ diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index b327c968..8c4c048a 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 98c9f412..cde11f08 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 6849e2e5..b8b34038 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 7421c706..d6ff0c7c 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 34f70156..3c55da6e 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 9f77fd74..71545afa 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 3e2f8454..1a054323 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 d0349953..cd15de81 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 d1436379..9a24012b 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 3682283c..f565a20b 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 60deaaa8..6d52b503 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 afefd636..9d1a5c96 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 1bc52832..224aa985 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 3f4533ae..fd14169e 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 15c0bae9..deb11208 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 d81290ed..834f4ea5 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 b8f1cc81..93aa1390 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 2ef72f3e..97cea9ce 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" -- Gitee From 4c0709f76b6d5f54e587f20c268370e7a786c428 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Tue, 7 Jun 2022 17:16:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E5=B1=8F?= =?UTF-8?q?=E5=B9=95=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- services/common/test/unittest/databuffer/BUILD.gn | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/services/common/test/unittest/databuffer/BUILD.gn b/services/common/test/unittest/databuffer/BUILD.gn index 6ec3ed09..89ae6f13 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/distributed_screen/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/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 +} -- Gitee From 9ae570c75e0308907326bc38f7fe6c6e5b572a81 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Tue, 7 Jun 2022 17:30:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E5=B1=8F?= =?UTF-8?q?=E5=B9=95=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- services/common/test/unittest/utils/BUILD.gn | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/services/common/test/unittest/utils/BUILD.gn b/services/common/test/unittest/utils/BUILD.gn index 42f8e8f1..e1fc24e4 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/distributed_screen/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/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 +} -- Gitee From 4883c9b6e4ce3f4b1df2a08805ad998c39ba37e7 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Tue, 7 Jun 2022 20:48:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E5=B1=8F?= =?UTF-8?q?=E5=B9=95=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 4c300b29..9f60bf89 100644 --- a/bundle.json +++ b/bundle.json @@ -15,7 +15,7 @@ "name":"distributed_screen", "subsystem":"distributedhardware", "syscap":[ - "SystemCapability.distributedhardware.distributed_screen" + "SystemCapability.Distributedhardware.DistributedScreen" ], "features":[], "adapted_system_type":[ -- Gitee From 7806d2f515cb22b374317c487f1253a8f5351bb5 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Wed, 8 Jun 2022 10:51:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 9f60bf89..d357bcaa 100644 --- a/bundle.json +++ b/bundle.json @@ -15,7 +15,7 @@ "name":"distributed_screen", "subsystem":"distributedhardware", "syscap":[ - "SystemCapability.Distributedhardware.DistributedScreen" + "SystemCapability.DistributedHardware.DistributedScreen" ], "features":[], "adapted_system_type":[ -- Gitee