From 2ead09d15ff5854b633d24ebb2ff4a91f0ceca63 Mon Sep 17 00:00:00 2001 From: zhangbirong Date: Mon, 15 May 2023 09:46:02 +0800 Subject: [PATCH] graphic_standard to graphic_2d Signed-off-by: zhangbirong Change-Id: I519bb7cb654cb3e0b4133cb76d0e03e8fab57a63 --- bundle.json | 2 +- dmserver/BUILD.gn | 2 +- dmserver/test/unittest/BUILD.gn | 2 +- interfaces/kits/napi/screen_runtime/BUILD.gn | 2 +- test/common/utils/BUILD.gn | 2 +- test/fuzztest/wms/window_fuzzer/BUILD.gn | 2 +- test/fuzztest/wms/windowagent_fuzzer/BUILD.gn | 2 +- test/fuzztest/wms/windowcontroller_fuzzer/BUILD.gn | 2 +- test/fuzztest/wms/windowpair_fuzzer/BUILD.gn | 2 +- test/fuzztest/wms/windowroot_fuzzer/BUILD.gn | 2 +- utils/BUILD.gn | 4 ++-- utils/test/unittest/BUILD.gn | 4 ++-- .../interfaces/kits/napi/session_manager_service/BUILD.gn | 2 +- wm/BUILD.gn | 4 ++-- wmserver/BUILD.gn | 2 +- wmserver/test/unittest/BUILD.gn | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bundle.json b/bundle.json index 1d3c30732d..1f5b615a63 100755 --- a/bundle.json +++ b/bundle.json @@ -28,7 +28,7 @@ "components": [ "sensor", "ability_base", - "graphic_standard", + "graphic_2d", "hisysevent_native", "ability_runtime", "napi", diff --git a/dmserver/BUILD.gn b/dmserver/BUILD.gn index 38ed807f3c..aff0c20ab2 100644 --- a/dmserver/BUILD.gn +++ b/dmserver/BUILD.gn @@ -62,7 +62,7 @@ ohos_shared_library("libdms") { "c_utils:utils", "config_policy:configpolicy_util", "eventhandler:libeventhandler", - "graphic_standard:surface", + "graphic_2d:surface", "hilog_native:libhilog", "hitrace_native:hitrace_meter", "ipc:ipc_single", diff --git a/dmserver/test/unittest/BUILD.gn b/dmserver/test/unittest/BUILD.gn index 9bc1117cc4..d9f516d347 100644 --- a/dmserver/test/unittest/BUILD.gn +++ b/dmserver/test/unittest/BUILD.gn @@ -73,7 +73,7 @@ ohos_unittest("dmserver_display_manager_proxy_test") { deps = [ ":dmserver_unittest_common" ] - external_deps = [ "graphic_standard:surface" ] + external_deps = [ "graphic_2d:surface" ] } ohos_unittest("dmserver_screen_rotation_controller_test") { diff --git a/interfaces/kits/napi/screen_runtime/BUILD.gn b/interfaces/kits/napi/screen_runtime/BUILD.gn index 6410ccb6b7..56282c3b16 100644 --- a/interfaces/kits/napi/screen_runtime/BUILD.gn +++ b/interfaces/kits/napi/screen_runtime/BUILD.gn @@ -42,7 +42,7 @@ ohos_shared_library("screen_napi") { external_deps = [ "ability_runtime:runtime", "c_utils:utils", - "graphic_standard:surface", # use for SurfaceUtils + "graphic_2d:surface", # use for SurfaceUtils "hiview:libxpower_event_js", "hiviewdfx_hilog_native:libhilog", "napi:ace_napi", diff --git a/test/common/utils/BUILD.gn b/test/common/utils/BUILD.gn index 50830957c6..1f6d1a197b 100644 --- a/test/common/utils/BUILD.gn +++ b/test/common/utils/BUILD.gn @@ -35,7 +35,7 @@ ohos_static_library("libtestutil") { "access_token:libnativetoken", "access_token:libtoken_setproc", "c_utils:utils", - "graphic_standard:surface", + "graphic_2d:surface", "hilog_native:libhilog", "multimedia_image_framework:image_native", ] diff --git a/test/fuzztest/wms/window_fuzzer/BUILD.gn b/test/fuzztest/wms/window_fuzzer/BUILD.gn index 64bff19929..546663e689 100644 --- a/test/fuzztest/wms/window_fuzzer/BUILD.gn +++ b/test/fuzztest/wms/window_fuzzer/BUILD.gn @@ -60,7 +60,7 @@ ohos_fuzztest("WindowFuzzTest") { "ace_engine:ace_uicontent", "c_utils:utils", "eventhandler:libeventhandler", - "graphic_standard:window_animation", + "graphic_2d:window_animation", "hilog_native:libhilog", "input:libmmi-client", "ipc:ipc_single", diff --git a/test/fuzztest/wms/windowagent_fuzzer/BUILD.gn b/test/fuzztest/wms/windowagent_fuzzer/BUILD.gn index d20f77b742..e8a30891cc 100644 --- a/test/fuzztest/wms/windowagent_fuzzer/BUILD.gn +++ b/test/fuzztest/wms/windowagent_fuzzer/BUILD.gn @@ -60,7 +60,7 @@ ohos_fuzztest("WindowAgentFuzzTest") { "ace_engine:ace_uicontent", "c_utils:utils", "eventhandler:libeventhandler", - "graphic_standard:window_animation", + "graphic_2d:window_animation", "hilog_native:libhilog", "input:libmmi-client", "ipc:ipc_single", diff --git a/test/fuzztest/wms/windowcontroller_fuzzer/BUILD.gn b/test/fuzztest/wms/windowcontroller_fuzzer/BUILD.gn index 3151b3c388..48126c5041 100644 --- a/test/fuzztest/wms/windowcontroller_fuzzer/BUILD.gn +++ b/test/fuzztest/wms/windowcontroller_fuzzer/BUILD.gn @@ -56,7 +56,7 @@ ohos_fuzztest("WindowControllerFuzzTest") { "config_policy:configpolicy_util", "display_manager:displaymgr", "eventhandler:libeventhandler", - "graphic_standard:window_animation", + "graphic_2d:window_animation", "hicollie_native:libhicollie", "hilog_native:libhilog", "hisysevent_native:libhisysevent", diff --git a/test/fuzztest/wms/windowpair_fuzzer/BUILD.gn b/test/fuzztest/wms/windowpair_fuzzer/BUILD.gn index 24ee7d0db9..e15b98ef9e 100644 --- a/test/fuzztest/wms/windowpair_fuzzer/BUILD.gn +++ b/test/fuzztest/wms/windowpair_fuzzer/BUILD.gn @@ -60,7 +60,7 @@ ohos_fuzztest("WindowPairFuzzTest") { "config_policy:configpolicy_util", "display_manager:displaymgr", "eventhandler:libeventhandler", - "graphic_standard:window_animation", + "graphic_2d:window_animation", "hicollie_native:libhicollie", "hilog_native:libhilog", "hisysevent_native:libhisysevent", diff --git a/test/fuzztest/wms/windowroot_fuzzer/BUILD.gn b/test/fuzztest/wms/windowroot_fuzzer/BUILD.gn index ca200fc6e6..f97aa8178e 100644 --- a/test/fuzztest/wms/windowroot_fuzzer/BUILD.gn +++ b/test/fuzztest/wms/windowroot_fuzzer/BUILD.gn @@ -64,7 +64,7 @@ ohos_fuzztest("WindowRootFuzzTest") { "config_policy:configpolicy_util", "display_manager:displaymgr", "eventhandler:libeventhandler", - "graphic_standard:window_animation", + "graphic_2d:window_animation", "hicollie_native:libhicollie", "hilog_native:libhilog", "hisysevent_native:libhisysevent", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index dbf3a8232d..7663bb6abf 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -73,7 +73,7 @@ ohos_static_library("libwmutil_static") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", - "graphic_standard:surface", + "graphic_2d:surface", "hilog_native:libhilog", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", @@ -133,7 +133,7 @@ ohos_shared_library("libwmutil") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", - "graphic_standard:surface", + "graphic_2d:surface", "hilog_native:libhilog", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", diff --git a/utils/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn index 3cf953078a..f414a30899 100644 --- a/utils/test/unittest/BUILD.gn +++ b/utils/test/unittest/BUILD.gn @@ -50,7 +50,7 @@ ohos_unittest("utils_screen_info_test") { deps = [ ":utils_unittest_common" ] - external_deps = [ "graphic_standard:surface" ] + external_deps = [ "graphic_2d:surface" ] } ohos_unittest("utils_screen_group_info_test") { @@ -60,7 +60,7 @@ ohos_unittest("utils_screen_group_info_test") { deps = [ ":utils_unittest_common" ] - external_deps = [ "graphic_standard:surface" ] + external_deps = [ "graphic_2d:surface" ] } ohos_unittest("utils_string_test") { diff --git a/window_scene/interfaces/kits/napi/session_manager_service/BUILD.gn b/window_scene/interfaces/kits/napi/session_manager_service/BUILD.gn index f78073fa0f..3f1653f0e3 100644 --- a/window_scene/interfaces/kits/napi/session_manager_service/BUILD.gn +++ b/window_scene/interfaces/kits/napi/session_manager_service/BUILD.gn @@ -43,7 +43,7 @@ ohos_shared_library("sessionmanagerservice_napi") { external_deps = [ "ability_runtime:runtime", "c_utils:utils", - "graphic_standard:surface", # use for SurfaceUtils + "graphic_2d:surface", # use for SurfaceUtils "hiviewdfx_hilog_native:libhilog", "ipc:ipc_napi_common", "napi:ace_napi", diff --git a/wm/BUILD.gn b/wm/BUILD.gn index a7414421d2..9a7b056ac6 100644 --- a/wm/BUILD.gn +++ b/wm/BUILD.gn @@ -76,7 +76,7 @@ ohos_static_library("libwm_static") { "ace_engine:ace_uicontent", "c_utils:utils", "eventhandler:libeventhandler", - "graphic_standard:window_animation", + "graphic_2d:window_animation", "hilog_native:libhilog", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", @@ -171,7 +171,7 @@ ohos_shared_library("libwm") { "ace_engine:ace_uicontent", "c_utils:utils", "eventhandler:libeventhandler", - "graphic_standard:window_animation", + "graphic_2d:window_animation", "hilog_native:libhilog", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", diff --git a/wmserver/BUILD.gn b/wmserver/BUILD.gn index b55d6065ad..8d30f15384 100644 --- a/wmserver/BUILD.gn +++ b/wmserver/BUILD.gn @@ -102,7 +102,7 @@ ohos_shared_library("libwms") { "config_policy:configpolicy_util", "display_manager:displaymgr", "eventhandler:libeventhandler", - "graphic_standard:window_animation", + "graphic_2d:window_animation", "hicollie_native:libhicollie", "hilog_native:libhilog", "hisysevent_native:libhisysevent", diff --git a/wmserver/test/unittest/BUILD.gn b/wmserver/test/unittest/BUILD.gn index e6ddd72bf1..da59ce56db 100644 --- a/wmserver/test/unittest/BUILD.gn +++ b/wmserver/test/unittest/BUILD.gn @@ -61,7 +61,7 @@ test_external_deps = [ "config_policy:configpolicy_util", "display_manager:displaymgr", "eventhandler:libeventhandler", - "graphic_standard:window_animation", + "graphic_2d:window_animation", "hicollie_native:libhicollie", "hilog_native:libhilog", "hisysevent_native:libhisysevent", -- Gitee