From dd133cf16ec488554b0649f3bc7e5cf99d2d4c6d Mon Sep 17 00:00:00 2001 From: BruceXuXu Date: Sun, 19 Nov 2023 02:19:30 +0000 Subject: [PATCH] fit graphic_surface Signed-off-by: BruceXuXu Change-Id: I241e3c36018dcbe07aa348d003b8d20659ba4b52 --- bundle.json | 1 + screenhandler/BUILD.gn | 2 +- screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn | 2 +- .../test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn | 2 +- screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn | 2 +- screenhandler/test/unittest/screenhandler/BUILD.gn | 2 +- services/common/test/unittest/decision_center/BUILD.gn | 4 ++-- services/common/test/unittest/imageJpeg/BUILD.gn | 2 +- services/screenclient/BUILD.gn | 2 +- services/screenclient/test/unittest/BUILD.gn | 2 +- services/screendemo/BUILD.gn | 2 +- services/screenservice/sinkservice/BUILD.gn | 2 +- services/screenservice/sourceservice/BUILD.gn | 2 +- .../sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn | 2 +- .../test/unittest/sinkservice/screenregionmgr/BUILD.gn | 2 +- .../test/unittest/sourceservice/dscreenmgr/BUILD.gn | 4 ++-- services/screentransport/screensinktrans/BUILD.gn | 2 +- services/screentransport/screensourcetrans/BUILD.gn | 4 ++-- .../screensinkprocessor/onbufferavailable_fuzzer/BUILD.gn | 4 ++-- .../screensourceprocessor/onbufferavailable_fuzzer/BUILD.gn | 4 ++-- .../fuzztest/screensourceprocessor/onerror_fuzzer/BUILD.gn | 4 ++-- .../oninputbufferavailable_fuzzer/BUILD.gn | 4 ++-- .../onoutputbufferavailable_fuzzer/BUILD.gn | 4 ++-- .../onoutputformatchanged_fuzzer/BUILD.gn | 4 ++-- .../test/unittest/screensinkprocessor/BUILD.gn | 2 +- .../screentransport/test/unittest/screensinktrans/BUILD.gn | 2 +- .../test/unittest/screensourceprocessor/BUILD.gn | 4 ++-- .../screentransport/test/unittest/screensourcetrans/BUILD.gn | 4 ++-- .../test/unittest/screentranstestutils/BUILD.gn | 4 ++-- 29 files changed, 41 insertions(+), 40 deletions(-) diff --git a/bundle.json b/bundle.json index 7750989b..be45e6da 100644 --- a/bundle.json +++ b/bundle.json @@ -37,6 +37,7 @@ "hilog", "input", "graphic_2d", + "graphic_surface", "samgr", "safwk", "hicollie", diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index 9a8c370e..e5e41885 100644 --- a/screenhandler/BUILD.gn +++ b/screenhandler/BUILD.gn @@ -49,7 +49,7 @@ ohos_shared_library("distributed_screen_handler") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", - "graphic_2d:surface", + "graphic_surface:surface", "ipc:ipc_core", "player_framework:media_client", "window_manager:libdm", diff --git a/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn index 30da30b7..1580f7fb 100644 --- a/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn @@ -56,7 +56,7 @@ ohos_fuzztest("PluginHardwareFuzzTest") { external_deps = [ "c_utils:utils", "graphic_2d:libgraphic_utils", - "graphic_2d:surface", + "graphic_surface:surface", "ipc:ipc_core", "window_manager:libdm", ] diff --git a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn index a2cc0967..93863738 100644 --- a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn @@ -56,7 +56,7 @@ ohos_fuzztest("RegisterPluginListenerFuzzTest") { external_deps = [ "c_utils:utils", "graphic_2d:libgraphic_utils", - "graphic_2d:surface", + "graphic_surface:surface", "ipc:ipc_core", "window_manager:libdm", ] diff --git a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn index afccc61b..4ee11475 100644 --- a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn @@ -56,7 +56,7 @@ ohos_fuzztest("UnPluginHardwareFuzzTest") { external_deps = [ "c_utils:utils", "graphic_2d:libgraphic_utils", - "graphic_2d:surface", + "graphic_surface:surface", "ipc:ipc_core", "window_manager:libdm", ] diff --git a/screenhandler/test/unittest/screenhandler/BUILD.gn b/screenhandler/test/unittest/screenhandler/BUILD.gn index c415dc4c..a56f495a 100644 --- a/screenhandler/test/unittest/screenhandler/BUILD.gn +++ b/screenhandler/test/unittest/screenhandler/BUILD.gn @@ -45,7 +45,7 @@ ohos_unittest("DscreenHandlerTest") { external_deps = [ "c_utils:utils", "graphic_2d:libgraphic_utils", - "graphic_2d:surface", + "graphic_surface:surface", "ipc:ipc_core", "player_framework:media_client", "window_manager:libdm", diff --git a/services/common/test/unittest/decision_center/BUILD.gn b/services/common/test/unittest/decision_center/BUILD.gn index 1c3d841f..3f49c407 100644 --- a/services/common/test/unittest/decision_center/BUILD.gn +++ b/services/common/test/unittest/decision_center/BUILD.gn @@ -44,8 +44,8 @@ ohos_unittest("ScreenDecisionCenterTest") { external_deps = [ "c_utils:utils", - "graphic_2d:surface", - "graphic_2d:sync_fence", + "graphic_surface:surface", + "graphic_surface:sync_fence", "player_framework:media_client", ] } diff --git a/services/common/test/unittest/imageJpeg/BUILD.gn b/services/common/test/unittest/imageJpeg/BUILD.gn index c0d6219f..ae3b91d0 100644 --- a/services/common/test/unittest/imageJpeg/BUILD.gn +++ b/services/common/test/unittest/imageJpeg/BUILD.gn @@ -43,7 +43,7 @@ ohos_unittest("JpegImageProcessorTest") { external_deps = [ "c_utils:utils", - "graphic_2d:surface", + "graphic_surface:surface", "player_framework:media_client", ] } diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index 8d9bf6fe..5f2f10d9 100644 --- a/services/screenclient/BUILD.gn +++ b/services/screenclient/BUILD.gn @@ -53,7 +53,7 @@ ohos_shared_library("distributed_screen_client") { "c_utils:utils", "graphic_2d:libgraphic_utils", "graphic_2d:librender_service_client", - "graphic_2d:surface", + "graphic_surface:surface", "input:libmmi-client", "window_manager:libwm", ] diff --git a/services/screenclient/test/unittest/BUILD.gn b/services/screenclient/test/unittest/BUILD.gn index 72263d85..2fbe13ac 100644 --- a/services/screenclient/test/unittest/BUILD.gn +++ b/services/screenclient/test/unittest/BUILD.gn @@ -52,7 +52,7 @@ ohos_unittest("ScreenClientTest") { external_deps = [ "c_utils:utils", "graphic_2d:librender_service_client", - "graphic_2d:surface", + "graphic_surface:surface", "input:libmmi-client", "window_manager:libwm", ] diff --git a/services/screendemo/BUILD.gn b/services/screendemo/BUILD.gn index a424fa5d..1e24ae2c 100644 --- a/services/screendemo/BUILD.gn +++ b/services/screendemo/BUILD.gn @@ -58,7 +58,7 @@ ohos_executable("distributedScreenTest") { "c_utils:utils", "dsoftbus:softbus_client", "graphic_2d:librender_service_client", - "graphic_2d:surface", + "graphic_surface:surface", "hilog:libhilog", "player_framework:media_client", "samgr:samgr_proxy", diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index d3255df9..49e69948 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -87,7 +87,7 @@ ohos_shared_library("distributed_screen_sink") { "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:libdhfwk_sdk", "graphic_2d:libgraphic_utils", - "graphic_2d:surface", + "graphic_surface:surface", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index 345bdb2b..46ce0c27 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -94,7 +94,7 @@ ohos_shared_library("distributed_screen_source") { "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "graphic_2d:libcomposer", - "graphic_2d:surface", + "graphic_surface:surface", "hicollie:libhicollie", "hisysevent:libhisysevent", "hitrace:hitrace_meter", diff --git a/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn b/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn index ca522c3e..3df30fe2 100644 --- a/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn +++ b/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn @@ -62,7 +62,7 @@ ohos_fuzztest("OnChangeFuzzTest") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:distributed_av_sender", - "graphic_2d:surface", + "graphic_surface:surface", "window_manager:libdm", ] } diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index 9b55ff11..80deea70 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -75,7 +75,7 @@ ohos_unittest("DscreenRegionMgrTest") { "distributed_hardware_fwk:distributedhardwareutils", "graphic_2d:libcomposer", "graphic_2d:libgraphic_utils", - "graphic_2d:surface", + "graphic_surface:surface", "hisysevent:libhisysevent", "window_manager:libdm", ] diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn index 5f052a74..aa82f239 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -79,8 +79,8 @@ ohos_unittest("DscreenMgrTest") { "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "graphic_2d:libcomposer", - "graphic_2d:surface", - "graphic_2d:sync_fence", + "graphic_surface:surface", + "graphic_surface:sync_fence", "hdf_core:libhdi", "player_framework:media_client", "window_manager:libdm", diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index c5b176ac..06c6368a 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -78,7 +78,7 @@ ohos_shared_library("distributed_screen_sinktrans") { "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", - "graphic_2d:surface", + "graphic_surface:surface", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index 8aaa41e1..7abc6fe0 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -77,8 +77,8 @@ ohos_shared_library("distributed_screen_sourcetrans") { "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", - "graphic_2d:surface", - "graphic_2d:sync_fence", + "graphic_surface:surface", + "graphic_surface:sync_fence", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", diff --git a/services/screentransport/test/fuzztest/screensinkprocessor/onbufferavailable_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensinkprocessor/onbufferavailable_fuzzer/BUILD.gn index c598119f..2adfea40 100644 --- a/services/screentransport/test/fuzztest/screensinkprocessor/onbufferavailable_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensinkprocessor/onbufferavailable_fuzzer/BUILD.gn @@ -63,8 +63,8 @@ ohos_fuzztest("OnBufferAvailableFuzzTest") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", - "graphic_2d:surface", - "graphic_2d:sync_fence", + "graphic_surface:surface", + "graphic_surface:sync_fence", "ipc:ipc_core", "player_framework:media_client", ] diff --git a/services/screentransport/test/fuzztest/screensourceprocessor/onbufferavailable_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor/onbufferavailable_fuzzer/BUILD.gn index 91fabe9f..9a0c7656 100644 --- a/services/screentransport/test/fuzztest/screensourceprocessor/onbufferavailable_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensourceprocessor/onbufferavailable_fuzzer/BUILD.gn @@ -63,8 +63,8 @@ ohos_fuzztest("OnBufferAvailableFuzzTest") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", - "graphic_2d:surface", - "graphic_2d:sync_fence", + "graphic_surface:surface", + "graphic_surface:sync_fence", "ipc:ipc_core", "player_framework:media_client", ] diff --git a/services/screentransport/test/fuzztest/screensourceprocessor/onerror_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor/onerror_fuzzer/BUILD.gn index 97b04802..2ef872ed 100644 --- a/services/screentransport/test/fuzztest/screensourceprocessor/onerror_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensourceprocessor/onerror_fuzzer/BUILD.gn @@ -55,8 +55,8 @@ ohos_fuzztest("OnErrorFuzzTest") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", - "graphic_2d:surface", - "graphic_2d:sync_fence", + "graphic_surface:surface", + "graphic_surface:sync_fence", "ipc:ipc_core", "player_framework:media_client", ] diff --git a/services/screentransport/test/fuzztest/screensourceprocessor/oninputbufferavailable_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor/oninputbufferavailable_fuzzer/BUILD.gn index 44e4bbf6..34f59f9b 100644 --- a/services/screentransport/test/fuzztest/screensourceprocessor/oninputbufferavailable_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensourceprocessor/oninputbufferavailable_fuzzer/BUILD.gn @@ -55,8 +55,8 @@ ohos_fuzztest("OnInputBufferAvailableFuzzTest") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", - "graphic_2d:surface", - "graphic_2d:sync_fence", + "graphic_surface:surface", + "graphic_surface:sync_fence", "ipc:ipc_core", "player_framework:media_client", ] diff --git a/services/screentransport/test/fuzztest/screensourceprocessor/onoutputbufferavailable_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor/onoutputbufferavailable_fuzzer/BUILD.gn index 3b5c8d6a..bf17b1bf 100644 --- a/services/screentransport/test/fuzztest/screensourceprocessor/onoutputbufferavailable_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensourceprocessor/onoutputbufferavailable_fuzzer/BUILD.gn @@ -56,8 +56,8 @@ ohos_fuzztest("OnOutputBufferAvailableFuzzTest") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", - "graphic_2d:surface", - "graphic_2d:sync_fence", + "graphic_surface:surface", + "graphic_surface:sync_fence", "ipc:ipc_core", "player_framework:media_client", ] diff --git a/services/screentransport/test/fuzztest/screensourceprocessor/onoutputformatchanged_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor/onoutputformatchanged_fuzzer/BUILD.gn index 86a4ee8e..8cd92f0d 100644 --- a/services/screentransport/test/fuzztest/screensourceprocessor/onoutputformatchanged_fuzzer/BUILD.gn +++ b/services/screentransport/test/fuzztest/screensourceprocessor/onoutputformatchanged_fuzzer/BUILD.gn @@ -55,8 +55,8 @@ ohos_fuzztest("OnOutputFormatChangedFuzzTest") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", - "graphic_2d:surface", - "graphic_2d:sync_fence", + "graphic_surface:surface", + "graphic_surface:sync_fence", "ipc:ipc_core", "player_framework:media_client", ] diff --git a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn index f38e2f47..344c0d17 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn @@ -60,7 +60,7 @@ ohos_unittest("SinkProcessorTest") { external_deps = [ "c_utils:utils", - "graphic_2d:surface", + "graphic_surface:surface", "player_framework:media_client", ] diff --git a/services/screentransport/test/unittest/screensinktrans/BUILD.gn b/services/screentransport/test/unittest/screensinktrans/BUILD.gn index 49dc1edd..2da1ec20 100644 --- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn @@ -58,7 +58,7 @@ ohos_unittest("SinkTransTest") { external_deps = [ "c_utils:utils", "dsoftbus:softbus_client", - "graphic_2d:surface", + "graphic_surface:surface", "player_framework:media_client", ] diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn index d30f19fb..09d19b0d 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn @@ -60,8 +60,8 @@ ohos_unittest("SourceProcessorTest") { external_deps = [ "c_utils:utils", - "graphic_2d:surface", - "graphic_2d:sync_fence", + "graphic_surface:surface", + "graphic_surface:sync_fence", "ipc:ipc_core", "player_framework:media_client", ] diff --git a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn index 3687d40b..ee33b0d6 100644 --- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn @@ -63,8 +63,8 @@ ohos_unittest("SourceTransTest") { external_deps = [ "c_utils:utils", "graphic_2d:libgraphic_utils", - "graphic_2d:surface", - "graphic_2d:sync_fence", + "graphic_surface:surface", + "graphic_surface:sync_fence", "ipc:ipc_core", "player_framework:media_client", ] diff --git a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn index d383974e..ba80bb96 100644 --- a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn +++ b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn @@ -65,8 +65,8 @@ ohos_unittest("ScreenCallbackTest") { external_deps = [ "c_utils:utils", "graphic_2d:libgraphic_utils", - "graphic_2d:surface", - "graphic_2d:sync_fence", + "graphic_surface:surface", + "graphic_surface:sync_fence", "ipc:ipc_core", "player_framework:media_client", ] -- Gitee