From 64bfea52886be07d6c078569d68d38f4477bf752 Mon Sep 17 00:00:00 2001 From: qinlong Date: Thu, 1 Sep 2022 14:06:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E5=B1=8F?= =?UTF-8?q?=E5=B9=95=E5=8E=BB=E9=99=A4=E5=86=97=E4=BD=99=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong -- Gitee From 0d193db8357f0affec0e261970009df2c2c3aee2 Mon Sep 17 00:00:00 2001 From: qinlong Date: Thu, 1 Sep 2022 14:16:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E5=B1=8F?= =?UTF-8?q?=E5=B9=95=E5=8E=BB=E9=99=A4=E5=86=97=E4=BD=99=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong --- common/BUILD.gn | 1 - interfaces/innerkits/native_cpp/screen_sink/BUILD.gn | 3 --- .../innerkits/native_cpp/screen_source/BUILD.gn | 3 --- screenhandler/BUILD.gn | 12 ++++++------ screenhandler/src/dscreen_handler.cpp | 2 +- services/screenclient/BUILD.gn | 8 +------- services/screenservice/sinkservice/BUILD.gn | 10 ++++++---- services/screenservice/sourceservice/BUILD.gn | 8 ++++---- 8 files changed, 18 insertions(+), 29 deletions(-) diff --git a/common/BUILD.gn b/common/BUILD.gn index ac535f82..f972803c 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -35,7 +35,6 @@ ohos_shared_library("distributed_screen_utils") { "c_utils:utils", "dsoftbus:softbus_client", "hisysevent_native:libhisysevent", - "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", ] diff --git a/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn index 4d3ad6de..2f2ddd29 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn +++ b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn @@ -45,11 +45,8 @@ ohos_shared_library("distributed_screen_sink_sdk") { external_deps = [ "c_utils:utils", - "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", - "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn index 86122775..bf427380 100644 --- a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn +++ b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn @@ -47,11 +47,8 @@ ohos_shared_library("distributed_screen_source_sdk") { external_deps = [ "c_utils:utils", - "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", - "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index 0ed1a43a..2f1199d5 100644 --- a/screenhandler/BUILD.gn +++ b/screenhandler/BUILD.gn @@ -27,6 +27,11 @@ ohos_shared_library("distributed_screen_handler") { include_dirs += [ "include", "${common_path}/include", + "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", + "//drivers/peripheral/display/interfaces/include", + "//drivers/peripheral/base", + "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", + "//foundation/graphic/graphic_2d/utils/buffer_handle/export", ] sources = [ "src/dscreen_handler.cpp" ] @@ -35,8 +40,6 @@ ohos_shared_library("distributed_screen_handler") { "${common_path}:distributed_screen_utils", "${mediastandard_path}/interfaces/inner_api/native:media_client", "${windowmanager_path}/dm:libdm", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] defines = [ @@ -45,10 +48,7 @@ ohos_shared_library("distributed_screen_handler") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ - "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", - ] + external_deps = [ "c_utils:utils" ] subsystem_name = "distributedhardware" diff --git a/screenhandler/src/dscreen_handler.cpp b/screenhandler/src/dscreen_handler.cpp index 435a4f53..5b4a669a 100644 --- a/screenhandler/src/dscreen_handler.cpp +++ b/screenhandler/src/dscreen_handler.cpp @@ -60,7 +60,7 @@ void ScreenListener::OnConnect(uint64_t screenId) { DHLOGI("on screen connect"); if (screenId != SCREEN_ID_DEFAULT) { - DHLOGE("screenId is invalid, screenId: %ulld", screenId); + DHLOGI("screenId is invalid, screenId: %ulld", screenId); return; } sptr screen = Rosen::ScreenManager::GetInstance().GetScreenById(screenId); diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index af113427..380caa65 100644 --- a/services/screenclient/BUILD.gn +++ b/services/screenclient/BUILD.gn @@ -37,10 +37,8 @@ ohos_shared_library("distributed_screen_client") { deps = [ "${common_path}:distributed_screen_utils", - "${graphicstandard_path}/frameworks/surface:surface", "${windowmanager_path}/wm:libwm", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] defines = [ @@ -49,11 +47,7 @@ ohos_shared_library("distributed_screen_client") { "LOG_DOMAIN=0xD004100", ] - external_deps = [ - "hisysevent_native:libhisysevent", - "hiviewdfx_hilog_native:libhilog", - "input:libmmi-client", - ] + external_deps = [ "input:libmmi-client" ] part_name = "distributed_screen" subsystem_name = "distributedhardware" diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index 2496a331..a794129e 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -22,7 +22,9 @@ ohos_shared_library("distributed_screen_sink") { "//third_party/json/include", "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", - "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", + "//foundation/graphic/graphic_2d/interfaces/inner_api/surface", + "//foundation/graphic/graphic_2d/interfaces/inner_api/common", + "//foundation/graphic/graphic_2d/utils/buffer_handle/export", "${windowmanager_path}/interfaces/innerkits/dm", "${fwk_common_path}/utils/include", "${distributedhardwarefwk_path}/interfaces/inner_kits/include", @@ -43,6 +45,9 @@ ohos_shared_library("distributed_screen_sink") { "${services_path}/screentransport/screensinkprocessor/include", "${services_path}/screentransport/screensinkprocessor/decoder/include", "${services_path}/screenclient/include/", + "//foundation/multimedia/image_standard/interfaces/innerkits/include", + "//drivers/peripheral/display/interfaces/include", + "//drivers/peripheral/base", ] sources = [ @@ -63,7 +68,6 @@ ohos_shared_library("distributed_screen_sink") { "${services_path}/screenclient:distributed_screen_client", "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans", "${windowmanager_path}/dm:libdm", - "//foundation/graphic/graphic_2d/frameworks/surface:surface", ] defines = [ @@ -74,9 +78,7 @@ ohos_shared_library("distributed_screen_sink") { external_deps = [ "c_utils:utils", - "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimedia_player_framework:media_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index ff5ea069..c861b69b 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -44,6 +44,10 @@ ohos_shared_library("distributed_screen_source") { "${services_path}/screentransport/screensourceprocessor/include", "${services_path}/screentransport/screensourceprocessor/encoder/include", "${services_path}/screentransport/screensourcetrans/include", + "//drivers/peripheral/display/interfaces/include", + "//drivers/peripheral/base", + "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", + "//foundation/graphic/graphic_2d/utils/buffer_handle/export", ] sources = [ @@ -66,8 +70,6 @@ ohos_shared_library("distributed_screen_source") { "${mediastandard_path}/interfaces/inner_api/native:media_client", "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", "${windowmanager_path}/dm:libdm", - "//foundation/graphic/graphic_2d/frameworks/surface:surface", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", ] defines = [ @@ -78,8 +80,6 @@ ohos_shared_library("distributed_screen_source") { external_deps = [ "c_utils:utils", - "hisysevent_native:libhisysevent", - "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", -- Gitee