From a28459cc26bfe3abc8d3caee8c258e3c3fcd1ca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=B9=8F=E6=98=8A?= Date: Fri, 30 Aug 2024 13:21:32 +0000 Subject: [PATCH 1/2] fix: Adjust gn order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨鹏昊 --- bundle.json | 3 ++- .../native_cpp/test/unittest/screensinktest/BUILD.gn | 1 + screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn | 1 + .../test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn | 1 + screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn | 1 + screenhandler/test/unittest/screenhandler/BUILD.gn | 1 + services/screenclient/BUILD.gn | 2 ++ services/screenclient/test/unittest/BUILD.gn | 4 ++++ services/screendemo/BUILD.gn | 1 + services/screenservice/sinkservice/BUILD.gn | 1 + services/screenservice/sourceservice/BUILD.gn | 2 ++ services/screentransport/screensinktrans/BUILD.gn | 1 + services/screentransport/screensourcetrans/BUILD.gn | 1 + 13 files changed, 19 insertions(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 6369a05f..6a11227e 100644 --- a/bundle.json +++ b/bundle.json @@ -47,7 +47,8 @@ "c_utils", "window_manager", "distributed_hardware_fwk", - "libjpeg-turbo" + "libjpeg-turbo", + "hdf_core" ], "third_party": [] }, diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn index 4752e7e6..092fb751 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn @@ -57,6 +57,7 @@ ohos_unittest("ScreenSinkTest") { "googletest:gtest_main", "ipc:ipc_core", "samgr:samgr_proxy", + "hilog:libhilog", ] } diff --git a/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn index b514afce..4e0fe030 100644 --- a/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn @@ -51,6 +51,7 @@ ohos_fuzztest("PluginHardwareFuzzTest") { "hilog:libhilog", "ipc:ipc_core", "window_manager:libdm", + "graphic_2d:librender_service_base", ] } diff --git a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn index d7f1f8b6..945e0e4c 100644 --- a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn @@ -51,6 +51,7 @@ ohos_fuzztest("RegisterPluginListenerFuzzTest") { "hilog:libhilog", "ipc:ipc_core", "window_manager:libdm", + "graphic_2d:librender_service_base", ] } diff --git a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn index 0dd1e215..4a8629be 100644 --- a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn @@ -51,6 +51,7 @@ ohos_fuzztest("UnPluginHardwareFuzzTest") { "hilog:libhilog", "ipc:ipc_core", "window_manager:libdm", + "graphic_2d:librender_service_base", ] } diff --git a/screenhandler/test/unittest/screenhandler/BUILD.gn b/screenhandler/test/unittest/screenhandler/BUILD.gn index 1d6d96d8..67205cc5 100644 --- a/screenhandler/test/unittest/screenhandler/BUILD.gn +++ b/screenhandler/test/unittest/screenhandler/BUILD.gn @@ -57,6 +57,7 @@ ohos_unittest("DscreenHandlerTest") { "ipc:ipc_core", "media_foundation:media_foundation", "window_manager:libdm", + "graphic_2d:librender_service_base", ] defines = [ diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index 2cce1550..885abbfc 100644 --- a/services/screenclient/BUILD.gn +++ b/services/screenclient/BUILD.gn @@ -58,6 +58,8 @@ ohos_shared_library("distributed_screen_client") { "input:libmmi-client", "json:nlohmann_json_static", "window_manager:libwm", + "ipc:ipc_core", + "eventhandler:libeventhandler", ] part_name = "distributed_screen" diff --git a/services/screenclient/test/unittest/BUILD.gn b/services/screenclient/test/unittest/BUILD.gn index 057379e3..d96d8b55 100644 --- a/services/screenclient/test/unittest/BUILD.gn +++ b/services/screenclient/test/unittest/BUILD.gn @@ -59,6 +59,10 @@ ohos_unittest("ScreenClientTest") { "graphic_surface:surface", "input:libmmi-client", "window_manager:libwm", + "hilog:libhilog", + "ipc:ipc_core", + "image_framework:pixelconvertadapter", + "graphic_2d:color_manager", ] } diff --git a/services/screendemo/BUILD.gn b/services/screendemo/BUILD.gn index e432b064..1c453b23 100644 --- a/services/screendemo/BUILD.gn +++ b/services/screendemo/BUILD.gn @@ -65,6 +65,7 @@ ohos_executable("distributedScreenTest") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", + "ipc:ipc_core", ] cflags = [ "-Wall" ] diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index 6db4bea6..9f34f561 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -96,6 +96,7 @@ ohos_shared_library("distributed_screen_sink") { "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libdm", + "ipc:ipc_core", ] public_external_deps = [ "json:nlohmann_json_static" ] diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 97da3dd8..fa8602f3 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -104,6 +104,8 @@ ohos_shared_library("distributed_screen_source") { "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libdm", + "eventhandler:libeventhandler", + "ipc:ipc_core", ] public_external_deps = [ "json:nlohmann_json_static" ] diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index 4bb63ebc..8c1094d4 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -78,6 +78,7 @@ ohos_shared_library("distributed_screen_sinktrans") { "json:nlohmann_json_static", "libjpeg-turbo:turbojpeg", "media_foundation:media_foundation", + "ipc:ipc_core", ] public_external_deps = [ "json:nlohmann_json_static" ] diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index 0960cebc..a6bb12d1 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -79,6 +79,7 @@ ohos_shared_library("distributed_screen_sourcetrans") { "json:nlohmann_json_static", "libjpeg-turbo:turbojpeg", "media_foundation:media_foundation", + "ipc:ipc_core", ] public_external_deps = [ "json:nlohmann_json_static" ] -- Gitee From 88b4e1e1c7b3254eadbc437e40c47fa670720b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=B9=8F=E6=98=8A?= Date: Fri, 30 Aug 2024 13:36:50 +0000 Subject: [PATCH 2/2] fix: Adjust gn order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨鹏昊 --- .../innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn index 092fb751..471cf9b4 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn @@ -55,9 +55,9 @@ ohos_unittest("ScreenSinkTest") { "distributed_hardware_fwk:distributedhardwareutils", "googletest:gmock", "googletest:gtest_main", + "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", - "hilog:libhilog", ] } -- Gitee