From 231d7d7fde426baa74a937bb71e88e480aad00f5 Mon Sep 17 00:00:00 2001 From: LeesonWong Date: Thu, 12 Sep 2024 14:22:44 +0800 Subject: [PATCH 1/3] Signed-off-by: wanglesheng build fix --- services/screenclient/BUILD.gn | 2 ++ services/screenservice/sourceservice/BUILD.gn | 2 ++ 2 files changed, 4 insertions(+) diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index 9a74d6b6..019dee69 100644 --- a/services/screenclient/BUILD.gn +++ b/services/screenclient/BUILD.gn @@ -50,6 +50,8 @@ ohos_shared_library("distributed_screen_client") { "distributed_hardware_fwk:distributedhardwareutils", "eventhandler:libeventhandler", "graphic_2d:2d_graphics", + "graphic_2d:EGL", + "graphic_2d:GLESv3", "graphic_2d:libcomposer", "graphic_2d:libgraphic_utils", "graphic_2d:librender_service_base", diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 4061c4fb..c745afe4 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -89,6 +89,8 @@ ohos_shared_library("distributed_screen_source") { "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "graphic_2d:2d_graphics", + "graphic_2d:EGL", + "graphic_2d:GLESv3", "graphic_2d:libcomposer", "graphic_2d:librender_service_base", "graphic_2d:librender_service_client", -- Gitee From 88c86df47c80e3240e01af748b51d1c7e1af4a8f Mon Sep 17 00:00:00 2001 From: LeesonWong Date: Thu, 26 Sep 2024 19:44:48 +0800 Subject: [PATCH 2/3] Signed-off-by: wanglesheng build fix --- screenhandler/BUILD.gn | 1 + services/screenclient/BUILD.gn | 2 ++ services/screenclient/test/unittest/BUILD.gn | 1 + services/screendemo/BUILD.gn | 1 + services/screenservice/sinkservice/BUILD.gn | 1 + services/screenservice/sourceservice/BUILD.gn | 2 ++ .../sourceservice/dscreenmgr/dscreenmanager_fuzzer/BUILD.gn | 1 + .../dscreenservice/dscreensourceservice_fuzzer/BUILD.gn | 1 + .../test/unittest/sinkservice/screenregionmgr/BUILD.gn | 1 + .../test/unittest/sourceservice/dscreenmgr/BUILD.gn | 1 + 10 files changed, 12 insertions(+) diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index cd69bbf6..83db898a 100644 --- a/screenhandler/BUILD.gn +++ b/screenhandler/BUILD.gn @@ -47,6 +47,7 @@ ohos_shared_library("distributed_screen_handler") { "distributed_hardware_fwk:distributedhardwareutils", "graphic_2d:2d_graphics", "graphic_2d:librender_service_base", + "graphic_2d:render_service_base_src", "graphic_surface:surface", "hilog:libhilog", "ipc:ipc_core", diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index 019dee69..d2d7d877 100644 --- a/services/screenclient/BUILD.gn +++ b/services/screenclient/BUILD.gn @@ -55,7 +55,9 @@ ohos_shared_library("distributed_screen_client") { "graphic_2d:libcomposer", "graphic_2d:libgraphic_utils", "graphic_2d:librender_service_base", + "graphic_2d:render_service_base_src", "graphic_2d:librender_service_client", + "graphic_2d:render_service_client_src", "graphic_surface:surface", "hilog:libhilog", "input:libmmi-client", diff --git a/services/screenclient/test/unittest/BUILD.gn b/services/screenclient/test/unittest/BUILD.gn index 057379e3..6f8ed69e 100644 --- a/services/screenclient/test/unittest/BUILD.gn +++ b/services/screenclient/test/unittest/BUILD.gn @@ -56,6 +56,7 @@ ohos_unittest("ScreenClientTest") { "googletest:gmock", "googletest:gtest_main", "graphic_2d:librender_service_client", + "graphic_2d:render_service_client_src", "graphic_surface:surface", "input:libmmi-client", "window_manager:libwm", diff --git a/services/screendemo/BUILD.gn b/services/screendemo/BUILD.gn index e432b064..a1e123d2 100644 --- a/services/screendemo/BUILD.gn +++ b/services/screendemo/BUILD.gn @@ -59,6 +59,7 @@ ohos_executable("distributedScreenTest") { "distributed_hardware_fwk:distributedhardwareutils", "dsoftbus:softbus_client", "graphic_2d:librender_service_client", + "graphic_2d:render_service_client_src", "graphic_surface:surface", "hilog:libhilog", "media_foundation:media_foundation", diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index 350eeae3..5c828305 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -86,6 +86,7 @@ ohos_shared_library("distributed_screen_sink") { "distributed_hardware_fwk:libdhfwk_sdk", "graphic_2d:libgraphic_utils", "graphic_2d:librender_service_client", + "graphic_2d:render_service_client_src", "graphic_surface:surface", "hilog:libhilog", "hisysevent:libhisysevent", diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index c745afe4..59f26201 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -93,7 +93,9 @@ ohos_shared_library("distributed_screen_source") { "graphic_2d:GLESv3", "graphic_2d:libcomposer", "graphic_2d:librender_service_base", + "graphic_2d:render_service_base_src", "graphic_2d:librender_service_client", + "graphic_2d:render_service_client_src", "graphic_surface:surface", "hicollie:libhicollie", "hilog:libhilog", diff --git a/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/dscreenmanager_fuzzer/BUILD.gn b/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/dscreenmanager_fuzzer/BUILD.gn index d6f3e04f..e95f679c 100644 --- a/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/dscreenmanager_fuzzer/BUILD.gn +++ b/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/dscreenmanager_fuzzer/BUILD.gn @@ -55,6 +55,7 @@ ohos_fuzztest("DScreenManagerFuzzTest") { "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "graphic_2d:librender_service_client", + "graphic_2d:render_service_client_src", "graphic_surface:surface", "hilog:libhilog", "json:nlohmann_json_static", diff --git a/services/screenservice/test/fuzztest/sourceservice/dscreenservice/dscreensourceservice_fuzzer/BUILD.gn b/services/screenservice/test/fuzztest/sourceservice/dscreenservice/dscreensourceservice_fuzzer/BUILD.gn index 1a164665..053aa19a 100644 --- a/services/screenservice/test/fuzztest/sourceservice/dscreenservice/dscreensourceservice_fuzzer/BUILD.gn +++ b/services/screenservice/test/fuzztest/sourceservice/dscreenservice/dscreensourceservice_fuzzer/BUILD.gn @@ -52,6 +52,7 @@ ohos_fuzztest("DscreenSourceServiceFuzzTest") { "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "graphic_2d:librender_service_client", + "graphic_2d:render_service_client_src", "graphic_surface:surface", "hilog:libhilog", "ipc:ipc_core", diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index fb9d52d4..387ffc10 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -81,6 +81,7 @@ ohos_unittest("DscreenRegionMgrTest") { "graphic_2d:libcomposer", "graphic_2d:libgraphic_utils", "graphic_2d:librender_service_client", + "graphic_2d:render_service_client_src", "graphic_surface:surface", "hisysevent:libhisysevent", "json:nlohmann_json_static", diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn index 1a6e3ed8..9fbffc13 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -85,6 +85,7 @@ ohos_unittest("DscreenMgrTest") { "googletest:gtest_main", "graphic_2d:libcomposer", "graphic_2d:librender_service_client", + "graphic_2d:render_service_client_src", "graphic_surface:surface", "graphic_surface:sync_fence", "hdf_core:libhdi", -- Gitee From 379045afd795b8f15570261898cc53e4c9d23f03 Mon Sep 17 00:00:00 2001 From: LeesonWong Date: Fri, 27 Sep 2024 10:58:09 +0800 Subject: [PATCH 3/3] Signed-off-by: wanglesheng build fix --- services/screenclient/BUILD.gn | 2 +- services/screenservice/sourceservice/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index d2d7d877..bab894ca 100644 --- a/services/screenclient/BUILD.gn +++ b/services/screenclient/BUILD.gn @@ -55,8 +55,8 @@ ohos_shared_library("distributed_screen_client") { "graphic_2d:libcomposer", "graphic_2d:libgraphic_utils", "graphic_2d:librender_service_base", - "graphic_2d:render_service_base_src", "graphic_2d:librender_service_client", + "graphic_2d:render_service_base_src", "graphic_2d:render_service_client_src", "graphic_surface:surface", "hilog:libhilog", diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 59f26201..9b714344 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -93,8 +93,8 @@ ohos_shared_library("distributed_screen_source") { "graphic_2d:GLESv3", "graphic_2d:libcomposer", "graphic_2d:librender_service_base", - "graphic_2d:render_service_base_src", "graphic_2d:librender_service_client", + "graphic_2d:render_service_base_src", "graphic_2d:render_service_client_src", "graphic_surface:surface", "hicollie:libhicollie", -- Gitee