From 9e3937f42155d6a177fb507dd623b9b636694fa7 Mon Sep 17 00:00:00 2001 From: zhangbirong Date: Fri, 7 Jul 2023 11:54:42 +0800 Subject: [PATCH] fix name Signed-off-by: zhangbirong Change-Id: Ib3769c0a115d6834d8651c5199b3130bde23e744 --- bundle.json | 2 +- screenhandler/BUILD.gn | 2 +- screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn | 4 ++-- .../test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn | 4 ++-- .../test/fuzztest/unpluginhardware_fuzzer/BUILD.gn | 4 ++-- screenhandler/test/unittest/screenhandler/BUILD.gn | 4 ++-- services/common/test/unittest/decision_center/BUILD.gn | 4 ++-- services/common/test/unittest/imageJpeg/BUILD.gn | 2 +- services/screenclient/BUILD.gn | 6 +++--- services/screenclient/test/unittest/BUILD.gn | 4 ++-- services/screendemo/BUILD.gn | 4 ++-- services/screenservice/sinkservice/BUILD.gn | 4 ++-- services/screenservice/sourceservice/BUILD.gn | 4 ++-- .../sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn | 2 +- .../test/unittest/sinkservice/screenregionmgr/BUILD.gn | 4 ++-- .../test/unittest/sourceservice/dscreenmgr/BUILD.gn | 6 +++--- 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 ++-- .../test/unittest/screensourcetrans/BUILD.gn | 6 +++--- .../test/unittest/screentranstestutils/BUILD.gn | 6 +++--- 29 files changed, 55 insertions(+), 55 deletions(-) diff --git a/bundle.json b/bundle.json index 4ee1c14b..02f11147 100644 --- a/bundle.json +++ b/bundle.json @@ -33,7 +33,7 @@ "ipc", "hilog", "input", - "graphic_standard", + "graphic_2d", "samgr", "safwk", "hitrace", diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index 11d1b083..b2a83b32 100644 --- a/screenhandler/BUILD.gn +++ b/screenhandler/BUILD.gn @@ -41,7 +41,7 @@ ohos_shared_library("distributed_screen_handler") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", - "graphic_standard:surface", + "graphic_2d: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 4df4261f..b6a084ee 100644 --- a/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/pluginhardware_fuzzer/BUILD.gn @@ -58,8 +58,8 @@ ohos_fuzztest("PluginHardwareFuzzTest") { external_deps = [ "c_utils:utils", - "graphic_standard:libgraphic_utils", - "graphic_standard:surface", + "graphic_2d:libgraphic_utils", + "graphic_2d: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 c5cd615d..8a01d489 100644 --- a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/BUILD.gn @@ -58,8 +58,8 @@ ohos_fuzztest("RegisterPluginListenerFuzzTest") { external_deps = [ "c_utils:utils", - "graphic_standard:libgraphic_utils", - "graphic_standard:surface", + "graphic_2d:libgraphic_utils", + "graphic_2d: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 f49a8776..41072cbb 100644 --- a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn +++ b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/BUILD.gn @@ -58,8 +58,8 @@ ohos_fuzztest("UnPluginHardwareFuzzTest") { external_deps = [ "c_utils:utils", - "graphic_standard:libgraphic_utils", - "graphic_standard:surface", + "graphic_2d:libgraphic_utils", + "graphic_2d:surface", "ipc:ipc_core", "window_manager:libdm", ] diff --git a/screenhandler/test/unittest/screenhandler/BUILD.gn b/screenhandler/test/unittest/screenhandler/BUILD.gn index 7f3591e1..a89516ec 100644 --- a/screenhandler/test/unittest/screenhandler/BUILD.gn +++ b/screenhandler/test/unittest/screenhandler/BUILD.gn @@ -47,8 +47,8 @@ ohos_unittest("DscreenHandlerTest") { external_deps = [ "c_utils:utils", - "graphic_standard:libgraphic_utils", - "graphic_standard:surface", + "graphic_2d:libgraphic_utils", + "graphic_2d: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 88ec1631..57ef6d22 100644 --- a/services/common/test/unittest/decision_center/BUILD.gn +++ b/services/common/test/unittest/decision_center/BUILD.gn @@ -43,8 +43,8 @@ ohos_unittest("ScreenDecisionCenterTest") { deps = [ "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans" ] external_deps = [ - "graphic_standard:surface", - "graphic_standard:sync_fence", + "graphic_2d:surface", + "graphic_2d: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 bd5c3438..081b2653 100644 --- a/services/common/test/unittest/imageJpeg/BUILD.gn +++ b/services/common/test/unittest/imageJpeg/BUILD.gn @@ -42,7 +42,7 @@ ohos_unittest("JpegImageProcessorTest") { deps = [ "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans" ] external_deps = [ - "graphic_standard:surface", + "graphic_2d:surface", "player_framework:media_client", ] } diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index 5fff315c..557e60df 100644 --- a/services/screenclient/BUILD.gn +++ b/services/screenclient/BUILD.gn @@ -41,9 +41,9 @@ ohos_shared_library("distributed_screen_client") { ] external_deps = [ - "graphic_standard:libgraphic_utils", - "graphic_standard:librender_service_client", - "graphic_standard:surface", + "graphic_2d:libgraphic_utils", + "graphic_2d:librender_service_client", + "graphic_2d:surface", "input:libmmi-client", "window_manager:libwm", ] diff --git a/services/screenclient/test/unittest/BUILD.gn b/services/screenclient/test/unittest/BUILD.gn index 96345642..fb49f3ea 100644 --- a/services/screenclient/test/unittest/BUILD.gn +++ b/services/screenclient/test/unittest/BUILD.gn @@ -50,8 +50,8 @@ ohos_unittest("ScreenClientTest") { ] external_deps = [ - "graphic_standard:librender_service_client", - "graphic_standard:surface", + "graphic_2d:librender_service_client", + "graphic_2d:surface", "input:libmmi-client", "window_manager:libwm", ] diff --git a/services/screendemo/BUILD.gn b/services/screendemo/BUILD.gn index 3ba81ec0..134b9fc2 100644 --- a/services/screendemo/BUILD.gn +++ b/services/screendemo/BUILD.gn @@ -51,8 +51,8 @@ ohos_executable("distributedScreenTest") { "access_token:libnativetoken", "access_token:libtoken_setproc", "dsoftbus:softbus_client", - "graphic_standard:librender_service_client", - "graphic_standard:surface", + "graphic_2d:librender_service_client", + "graphic_2d: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 2c72430d..7d5a6adf 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -71,8 +71,8 @@ ohos_shared_library("distributed_screen_sink") { "c_utils:utils", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:libdhfwk_sdk", - "graphic_standard:libgraphic_utils", - "graphic_standard:surface", + "graphic_2d:libgraphic_utils", + "graphic_2d:surface", "hisysevent:libhisysevent", "ipc:ipc_core", "multimedia_image_framework:image_native", diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index cdff4826..a9772a47 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -78,8 +78,8 @@ ohos_shared_library("distributed_screen_source") { "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", - "graphic_standard:libcomposer", - "graphic_standard:surface", + "graphic_2d:libcomposer", + "graphic_2d:surface", "hisysevent:libhisysevent", "ipc:ipc_core", "multimedia_image_framework:image_native", 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 4ee209e9..193b7ae1 100644 --- a/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn +++ b/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn @@ -61,7 +61,7 @@ ohos_fuzztest("OnChangeFuzzTest") { external_deps = [ "distributed_hardware_fwk:distributed_av_sender", - "graphic_standard:surface", + "graphic_2d: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 ef148154..e3ebddf0 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -64,8 +64,8 @@ ohos_unittest("DscreenRegionMgrTest") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:distributed_av_receiver", - "graphic_standard:libgraphic_utils", - "graphic_standard:surface", + "graphic_2d:libgraphic_utils", + "graphic_2d:surface", "hisysevent:libhisysevent", "multimedia_image_framework:image_native", "window_manager:libdm", diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn index 0deacdb9..d743bbb5 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -69,9 +69,9 @@ ohos_unittest("DscreenMgrTest") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:distributed_av_sender", - "graphic_standard:libcomposer", - "graphic_standard:surface", - "graphic_standard:sync_fence", + "graphic_2d:libcomposer", + "graphic_2d:surface", + "graphic_2d: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 4f9e90b1..308026bf 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -76,7 +76,7 @@ ohos_shared_library("distributed_screen_sinktrans") { "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", - "graphic_standard:surface", + "graphic_2d:surface", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index 0e498564..41a826de 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -75,8 +75,8 @@ ohos_shared_library("distributed_screen_sourcetrans") { "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", - "graphic_standard:surface", - "graphic_standard:sync_fence", + "graphic_2d:surface", + "graphic_2d: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 5ff3e0aa..c14f810a 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_standard:surface", - "graphic_standard:sync_fence", + "graphic_2d:surface", + "graphic_2d: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 3efc0547..3994daf0 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_standard:surface", - "graphic_standard:sync_fence", + "graphic_2d:surface", + "graphic_2d: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 888d2784..e00cbd3e 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_standard:surface", - "graphic_standard:sync_fence", + "graphic_2d:surface", + "graphic_2d: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 0bd72993..5c70045a 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_standard:surface", - "graphic_standard:sync_fence", + "graphic_2d:surface", + "graphic_2d: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 951e1cef..fcd1f3e9 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_standard:surface", - "graphic_standard:sync_fence", + "graphic_2d:surface", + "graphic_2d: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 a36b4c44..b78db3e0 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_standard:surface", - "graphic_standard:sync_fence", + "graphic_2d:surface", + "graphic_2d: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 868ab798..7aa0a686 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn @@ -63,7 +63,7 @@ ohos_unittest("SinkProcessorTest") { external_deps = [ "c_utils:utils", - "graphic_standard:surface", + "graphic_2d:surface", "player_framework:media_client", ] diff --git a/services/screentransport/test/unittest/screensinktrans/BUILD.gn b/services/screentransport/test/unittest/screensinktrans/BUILD.gn index 7ef826d1..4920d6fe 100644 --- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn @@ -61,7 +61,7 @@ ohos_unittest("SinkTransTest") { external_deps = [ "c_utils:utils", "dsoftbus:softbus_client", - "graphic_standard:surface", + "graphic_2d:surface", "player_framework:media_client", ] diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn index 9fc39994..ee641593 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn @@ -61,8 +61,8 @@ ohos_unittest("SourceProcessorTest") { external_deps = [ "c_utils:utils", - "graphic_standard:surface", - "graphic_standard:sync_fence", + "graphic_2d:surface", + "graphic_2d: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 f9e4269c..cd69fa88 100644 --- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn @@ -63,9 +63,9 @@ ohos_unittest("SourceTransTest") { external_deps = [ "c_utils:utils", - "graphic_standard:libgraphic_utils", - "graphic_standard:surface", - "graphic_standard:sync_fence", + "graphic_2d:libgraphic_utils", + "graphic_2d:surface", + "graphic_2d: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 d05ba1a7..16e7e596 100644 --- a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn +++ b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn @@ -65,9 +65,9 @@ ohos_unittest("ScreenCallbackTest") { external_deps = [ "c_utils:utils", - "graphic_standard:libgraphic_utils", - "graphic_standard:surface", - "graphic_standard:sync_fence", + "graphic_2d:libgraphic_utils", + "graphic_2d:surface", + "graphic_2d:sync_fence", "ipc:ipc_core", "player_framework:media_client", ] -- Gitee