!87 分布式屏幕部件化整改

Merge pull request !87 from qinlong/master
This commit is contained in:
openharmony_ci
2022-06-09 04:17:45 +00:00
committed by Gitee
35 changed files with 76 additions and 78 deletions
+1 -1
View File
@@ -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
+1 -1
View File
@@ -24,7 +24,7 @@
## **目录**
```
/foundation/distributedhardware/distributedscreen
/foundation/distributedhardware/distributed_screen
├── common # 分布式屏幕公共数据定义,包括常量、错误码、日志、工具等
├── interface # 分布式屏幕SDK,包含主控端和被控端服务调用接口
├── sa_profile # 分布式屏幕的SA配置信息
+27 -27
View File
@@ -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"
]
}
}
+1 -1
View File
@@ -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 = [
+1 -1
View File
@@ -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"
@@ -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 = [
@@ -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 = [
@@ -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") {
@@ -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") {
@@ -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") {
@@ -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") {
@@ -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",
@@ -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",
+1 -1
View File
@@ -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 = [
@@ -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") {
@@ -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" ]
}
}
+8 -9
View File
@@ -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" ]
}
}
+1 -1
View File
@@ -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 = [
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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 = [
@@ -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 = [
@@ -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 = [
@@ -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 = [
@@ -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") {
@@ -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") {
@@ -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") {
@@ -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") {
@@ -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") {
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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") {
@@ -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"