diff --git a/bundle.json b/bundle.json index adba736c5f9e210a03bd78417ff67dfce89616a8..1c442b5cf0336551875e483ac8f2dc91d0dfc1e8 100644 --- a/bundle.json +++ b/bundle.json @@ -33,7 +33,7 @@ "ipc", "hilog", "input", - "graphic_standard", + "graphic_2d", "samgr", "safwk", "hitrace_native", diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn index 11d1b083f33020865594a1adf4e42300f7ec41fc..b2a83b3214bc85aa3e37cb204c4de25eed011931 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 4df4261fda8901b965756014211f471d8175e7f2..b6a084ee51e2e2aa00f2b1a28f1ba8fa661f8f2c 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 c5cd615d20acb5b70f9a5505dae98a5773be8c82..8a01d489bc0bbb082116b3f757d83f6e698d0e7f 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 f49a8776a3d9b1b0e4de945af168d26d15f12242..41072cbb471564432b875b38c831463fbf18ae5f 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 7f3591e19f628ea395d9683278f5461612aacb76..a89516ecd243e0b8708d9ce5aed750c44929bdec 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 88ec16318726beaea3b8ae3fe8a1c73e3333b7b6..57ef6d220bba8bbe5155209b373d878eff59d104 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 bd5c34387add5e9623f6ecfa16045fccb96759d7..081b26530a13a9fc82fb033e808244b8ec9fff09 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 5fff315cbf2af14736ca6899387d1d1e3d5b634d..557e60df1cf1f1bbeffb76e509ef51ed3c8cc558 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 963456426aa6a3ce25da7594d91d3be12157becb..fb49f3ea611f6c53071a22546a5baa53e3a30bc3 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 3ba81ec06a23765290896e820e12916d0b4ea0b8..134b9fc25ddeae5f518dd038c0ba7cf295686cff 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 6103376ca6425eeafc25a728c4dc2c751941cfea..52645cdc019a98ce345506bf2d2e4c076e6f3580 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_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 8f1519bf8b6e5328b3157e6ab392e9a3d1929c50..2e2298c745466291bf2f74d495ad6c512eeefc76 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -76,8 +76,8 @@ ohos_shared_library("distributed_screen_source") { "c_utils:utils", "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:libdhfwk_sdk", - "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/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn b/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn index 4ee209e91379f7f337a36c8efe0d1475135270ca..193b7ae17c3f3011473c130712e47b175c9dcef7 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 8426c8f29a4211334cddc287d6ae7777e12d55a6..5732f043c7bd8280dd602b56ad04a55039ff434c 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_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 0deacdb947467d97d2b04ae165d466dd7460358a..d743bbb560c65746e20fa121b8faab036f8d4238 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 c0cf6d2a80140f9c70a218eb8bed7b6074b6b673..d25f0621a7527d8c73fae8187dd7c468e3ae7e10 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_native:libhisysevent", "hitrace_native:hitrace_meter", diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index 6243f2a609ae91d5fecadfeefbcc550f8916e1ac..535ccec537fd323541c80dde8fb4b3e079a808f0 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_native:libhisysevent", "hitrace_native: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 5ff3e0aada0472b4defd6fbff213d088bf222400..c14f810a27c7acbd7e2da330419a0689582edce8 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 3efc0547e4361c617657b21900c0b08cbb401ad9..3994daf0f2bd324cbfbe1d5161bd099c4b78c2b9 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 888d278480ec0c6c21a7aa93b4d669491b6754c0..e00cbd3e54a692319b9397f0058a9ecce7f52b12 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 0bd72993a758ed1d2e8378a56b1cd4add871ab22..5c70045a0f702ad3d15e7afa5fcb8a921c4f60d2 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 951e1cef5a601f54f88b8a52700ac258dd86e400..fcd1f3e93be43e560c88bdaf00b7b4043959c246 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 a36b4c44f7f585438f582c3a35065b1af82c0e24..b78db3e0d0cb49b544208aa84bbfeb82eeb5c780 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 868ab7983429e765a73cea4847f491894e60d39d..7aa0a686e2bd3586ce157414efa52082c5e13a03 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 7ef826d10d5b70b77d827406383187d0c8718f73..4920d6fe6c4942557ab123dc2014c70f13b9e154 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 9fc399941fd7ba4fa950c6f82c8501a34b3ac62d..ee6415933da97234ceda0b4beee344c805dfca49 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 f9e4269c8a1cbe3d56af1bebf161f4c3b0787bb9..cd69fa880030553e4edf4e4830abab46d013a131 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 d05ba1a7c0eefc52b955e31cee455a45896ccae4..16e7e596c7fa9c7c42b698c5cd66ad6e19e53c00 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", ]