From bf6081246c7f53ac927347870a77acfb4d23c804 Mon Sep 17 00:00:00 2001 From: zhangbirong Date: Mon, 15 May 2023 13:54:32 +0800 Subject: [PATCH] change graphic_standard to graphic_2d Signed-off-by: zhangbirong Change-Id: I4c31a7a9afa6a4b1c42f780b44ecd1c9a72b2b91 --- 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 | 4 ++-- services/screenclient/test/unittest/BUILD.gn | 2 +- services/screendemo/BUILD.gn | 2 +- services/screenservice/sinkservice/BUILD.gn | 4 ++-- services/screenservice/sourceservice/BUILD.gn | 4 ++-- .../test/unittest/sinkservice/screenregionmgr/BUILD.gn | 4 ++-- .../test/unittest/sourceservice/dscreenmgr/BUILD.gn | 2 +- services/screentransport/screensinktrans/BUILD.gn | 2 +- services/screentransport/screensourcetrans/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 +++--- 22 files changed, 37 insertions(+), 37 deletions(-) diff --git a/bundle.json b/bundle.json index d944c116..b6761b5e 100644 --- a/bundle.json +++ b/bundle.json @@ -33,7 +33,7 @@ "ipc", "hiviewdfx_hilog_native", "input", - "graphic_standard", + "graphic_2d", "samgr", "safwk", "hitrace_native", diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index e9638c1a..dee38392 100644 --- a/screenhandler/BUILD.gn +++ b/screenhandler/BUILD.gn @@ -39,7 +39,7 @@ ohos_shared_library("distributed_screen_handler") { external_deps = [ "c_utils:utils", - "graphic_standard:surface", + "graphic_2d:surface", "ipc:ipc_core", "multimedia_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 653b832e..cf39bea8 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", "multimedia_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 eda3080b..2f8fac9d 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", "multimedia_player_framework:media_client", ] } diff --git a/services/common/test/unittest/imageJpeg/BUILD.gn b/services/common/test/unittest/imageJpeg/BUILD.gn index 417517d7..a6a6cf3f 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", "multimedia_player_framework:media_client", ] } diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn index bc3234d2..37c7225f 100644 --- a/services/screenclient/BUILD.gn +++ b/services/screenclient/BUILD.gn @@ -44,8 +44,8 @@ ohos_shared_library("distributed_screen_client") { ] external_deps = [ - "graphic_standard:libgraphic_utils", - "graphic_standard:surface", + "graphic_2d:libgraphic_utils", + "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 8434798c..64d4636e 100644 --- a/services/screenclient/test/unittest/BUILD.gn +++ b/services/screenclient/test/unittest/BUILD.gn @@ -51,7 +51,7 @@ ohos_unittest("ScreenClientTest") { ] external_deps = [ - "graphic_standard:surface", + "graphic_2d:surface", "input:libmmi-client", "window_manager:libwm", ] diff --git a/services/screendemo/BUILD.gn b/services/screendemo/BUILD.gn index f9a032f4..6b37886e 100644 --- a/services/screendemo/BUILD.gn +++ b/services/screendemo/BUILD.gn @@ -52,7 +52,7 @@ ohos_executable("distributedScreenTest") { "access_token:libnativetoken", "access_token:libtoken_setproc", "dsoftbus:softbus_client", - "graphic_standard:surface", + "graphic_2d:surface", "hiviewdfx_hilog_native:libhilog", "multimedia_player_framework:media_client", "samgr:samgr_proxy", diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index e3b67c77..dfd660c6 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -67,8 +67,8 @@ ohos_shared_library("distributed_screen_sink") { external_deps = [ "c_utils:utils", - "graphic_standard:libgraphic_utils", - "graphic_standard:surface", + "graphic_2d:libgraphic_utils", + "graphic_2d:surface", "hisysevent_native:libhisysevent", "ipc:ipc_core", "multimedia_image_framework:image_native", diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index a87c8dc7..580b96b4 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -71,8 +71,8 @@ ohos_shared_library("distributed_screen_source") { external_deps = [ "c_utils:utils", - "graphic_standard:libcomposer", - "graphic_standard:surface", + "graphic_2d:libcomposer", + "graphic_2d:surface", "hisysevent_native:libhisysevent", "ipc:ipc_core", "multimedia_image_framework:image_native", diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index 857e84d4..2121a335 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -63,8 +63,8 @@ ohos_unittest("DscreenRegionMgrTest") { external_deps = [ "c_utils:utils", - "graphic_standard:libgraphic_utils", - "graphic_standard:surface", + "graphic_2d:libgraphic_utils", + "graphic_2d:surface", "hisysevent_native: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 224ac8c9..6ec8a843 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -71,7 +71,7 @@ ohos_unittest("DscreenMgrTest") { external_deps = [ "c_utils:utils", - "graphic_standard:sync_fence", + "graphic_2d:sync_fence", "hdf_core:libhdi", "multimedia_player_framework:media_client", "window_manager:libdm", diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index 7afd6d5e..a83178bb 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -75,7 +75,7 @@ ohos_shared_library("distributed_screen_sinktrans") { external_deps = [ "c_utils:utils", "dsoftbus:softbus_client", - "graphic_standard:surface", + "graphic_2d:surface", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index d1195959..c16d711a 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -74,8 +74,8 @@ ohos_shared_library("distributed_screen_sourcetrans") { external_deps = [ "c_utils:utils", "dsoftbus:softbus_client", - "graphic_standard:surface", - "graphic_standard:sync_fence", + "graphic_2d:surface", + "graphic_2d:sync_fence", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", diff --git a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn index d804e04b..c185e921 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", "multimedia_player_framework:media_client", ] diff --git a/services/screentransport/test/unittest/screensinktrans/BUILD.gn b/services/screentransport/test/unittest/screensinktrans/BUILD.gn index 5a9b8dfb..edc306b7 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", "multimedia_player_framework:media_client", ] diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn index 0b458f99..593a4789 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", "multimedia_player_framework:media_client", ] diff --git a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn index 6d044e8b..6acae812 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", "multimedia_player_framework:media_client", ] diff --git a/services/screentransport/test/unittest/screentranstestutils/BUILD.gn b/services/screentransport/test/unittest/screentranstestutils/BUILD.gn index 4029a43d..b68be15a 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", "multimedia_player_framework:media_client", ] -- Gitee