From bc7e3bf9e9690dbe27496731698b292d5aa007f7 Mon Sep 17 00:00:00 2001 From: sxzheng96 Date: Fri, 11 Mar 2022 16:08:07 +0800 Subject: [PATCH] fix compile problem in rk3568 Signed-off-by: sxzheng96 --- common/src/dscreen_util.cpp | 1 + screenhandler/BUILD.gn | 3 ++- services/common/databuffer/include/data_buffer.h | 1 + services/common/test/unittest/databuffer/BUILD.gn | 1 - services/common/test/unittest/databuffer/data_buffer_test.h | 1 + services/common/test/unittest/utils/BUILD.gn | 1 - services/screenclient/BUILD.gn | 4 +++- services/screenclient/test/unittest/BUILD.gn | 1 - services/screenservice/sinkservice/BUILD.gn | 1 - services/screenservice/sourceservice/BUILD.gn | 2 +- .../screensinkprocessor/decoder/include/image_sink_decoder.h | 1 + .../encoder/src/image_source_encoder.cpp | 1 + .../screentranstestutils/include/screentrans_test_utils.h | 2 ++ 13 files changed, 13 insertions(+), 7 deletions(-) diff --git a/common/src/dscreen_util.cpp b/common/src/dscreen_util.cpp index 95ba2b78..974e92be 100644 --- a/common/src/dscreen_util.cpp +++ b/common/src/dscreen_util.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include "softbus_bus_center.h" diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index cd5c1ec4..1f32267f 100644 --- a/screenhandler/BUILD.gn +++ b/screenhandler/BUILD.gn @@ -35,7 +35,8 @@ ohos_shared_library("distributed_screen_handler") { deps = [ "//utils/native/base:utils", "${mediastandard_path}/interfaces/innerkits/native/media:media_client", - "${windowmanager_path}/interfaces/innerkits:wm_interface", + "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client", "${windowmanager_path}/dm:libdm", "${common_path}:distributed_screen_utils", ] diff --git a/services/common/databuffer/include/data_buffer.h b/services/common/databuffer/include/data_buffer.h index 0c876f92..7c465b66 100644 --- a/services/common/databuffer/include/data_buffer.h +++ b/services/common/databuffer/include/data_buffer.h @@ -17,6 +17,7 @@ #define OHOS_DATA_BUFFER_H #include +#include namespace OHOS { namespace DistributedHardware { diff --git a/services/common/test/unittest/databuffer/BUILD.gn b/services/common/test/unittest/databuffer/BUILD.gn index 3303511b..83a66676 100644 --- a/services/common/test/unittest/databuffer/BUILD.gn +++ b/services/common/test/unittest/databuffer/BUILD.gn @@ -52,7 +52,6 @@ ohos_unittest("DataBufferTest") { "${fwk_utils_path}:distributedhardwareutils", "${graphicstandard_path}/frameworks/surface:surface", "${graphicstandard_path}/rosen/modules/render_service_client:librender_service_client", - "${windowmanager_path}/interfaces/innerkits:wm_interface", "${windowmanager_path}/wm:libwm", "//foundation/distributedhardware/distributedscreen/services/screentransport/screensinktrans:distributed_screen_sinktrans", ] diff --git a/services/common/test/unittest/databuffer/data_buffer_test.h b/services/common/test/unittest/databuffer/data_buffer_test.h index 4f0a72ba..b9bf80ff 100644 --- a/services/common/test/unittest/databuffer/data_buffer_test.h +++ b/services/common/test/unittest/databuffer/data_buffer_test.h @@ -18,6 +18,7 @@ #include #include +#include #include "data_buffer.h" diff --git a/services/common/test/unittest/utils/BUILD.gn b/services/common/test/unittest/utils/BUILD.gn index a7fb7152..609fd72d 100644 --- a/services/common/test/unittest/utils/BUILD.gn +++ b/services/common/test/unittest/utils/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("UtilsTest") { "${fwk_utils_path}:distributedhardwareutils", "${graphicstandard_path}/frameworks/surface:surface", "${graphicstandard_path}/rosen/modules/render_service_client:librender_service_client", - "${windowmanager_path}/interfaces/innerkits:wm_interface", "${windowmanager_path}/wm:libwm", "//foundation/distributedhardware/distributedscreen/services/screenservice/sinkservice:distributed_screen_sink", ] diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index 603c6378..d81a18c7 100644 --- a/services/screenclient/BUILD.gn +++ b/services/screenclient/BUILD.gn @@ -38,7 +38,8 @@ ohos_shared_library("distributed_screen_client") { deps = [ "${common_path}:distributed_screen_utils", "${graphicstandard_path}/frameworks/surface:surface", - "${windowmanager_path}/interfaces/innerkits:wm_interface", + "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client", "${windowmanager_path}/wm:libwm", "//foundation/multimodalinput/input:mmi_uinject", ] @@ -51,6 +52,7 @@ ohos_shared_library("distributed_screen_client") { external_deps = [ "hiviewdfx_hilog_native:libhilog", + "multimodalinput_base:libmmi-client", ] part_name = "distributed_screen" diff --git a/services/screenclient/test/unittest/BUILD.gn b/services/screenclient/test/unittest/BUILD.gn index 4becb3d9..36bde322 100644 --- a/services/screenclient/test/unittest/BUILD.gn +++ b/services/screenclient/test/unittest/BUILD.gn @@ -52,7 +52,6 @@ ohos_unittest("ScreenClientTest") { "${fwk_utils_path}:distributedhardwareutils", "${graphicstandard_path}/frameworks/surface:surface", "${graphicstandard_path}/rosen/modules/render_service_client:librender_service_client", - "${windowmanager_path}/interfaces/innerkits:wm_interface", "${windowmanager_path}/wm:libwm", "//foundation/distributedhardware/distributedscreen/services/screenclient:distributed_screen_client", ] diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index 806fc477..0564cbda 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -59,7 +59,6 @@ ohos_shared_library("distributed_screen_sink") { "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans", "${services_path}/screenclient:distributed_screen_client", "//foundation/graphic/standard/frameworks/surface:surface", - "${windowmanager_path}/interfaces/innerkits:wm_interface", "${windowmanager_path}/dm:libdm", ] diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 37777849..0fc5f388 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -59,8 +59,8 @@ ohos_shared_library("distributed_screen_source") { "//utils/native/base:utils", "${common_path}:distributed_screen_utils", "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans", + "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client", "//foundation/graphic/standard/frameworks/surface:surface", - "${windowmanager_path}/interfaces/innerkits:wm_interface", "${windowmanager_path}/dm:libdm", ] diff --git a/services/screentransport/screensinkprocessor/decoder/include/image_sink_decoder.h b/services/screentransport/screensinkprocessor/decoder/include/image_sink_decoder.h index fa17b5a1..4e378cac 100644 --- a/services/screentransport/screensinkprocessor/decoder/include/image_sink_decoder.h +++ b/services/screentransport/screensinkprocessor/decoder/include/image_sink_decoder.h @@ -20,6 +20,7 @@ #include #include #include +#include #include "avsharedmemory.h" #include "avcodec_common.h" diff --git a/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp b/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp index 4fb31b4b..bfd1c630 100644 --- a/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp +++ b/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp @@ -16,6 +16,7 @@ #include "image_source_encoder.h" #include +#include #include "dscreen_constants.h" #include "dscreen_errcode.h" diff --git a/services/screentransport/test/unittest/screentranstestutils/include/screentrans_test_utils.h b/services/screentransport/test/unittest/screentranstestutils/include/screentrans_test_utils.h index b38537d3..c62e6269 100644 --- a/services/screentransport/test/unittest/screentranstestutils/include/screentrans_test_utils.h +++ b/services/screentransport/test/unittest/screentranstestutils/include/screentrans_test_utils.h @@ -16,6 +16,8 @@ #ifndef OHOS_SCREEN_TRANS_TEST_UTILS_H #define OHOS_SCREEN_TRANS_TEST_UTILS_H +#include + #include "dscreen_errcode.h" #include "dscreen_log.h" #include "iimage_sink_processor_listener.h" -- Gitee