diff --git a/bundle.json b/bundle.json index 1d3c30732d955b71d8f4d3752e00abda037eb175..1f5b615a6373becc05fc27719c50f618f46437ee 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 38ed807f3c4cd8a47b2e7f23963c7720d67adfea..aff0c20ab2f2dfae037aa719656a3c2b333f3314 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 9bc1117cc4ca5f5a21372f9beb6a0c187cbb1020..d9f516d3474067fac54716b2cc381e15849c780d 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 6410ccb6b7095c74f88cbd174eefa6a3bea4f709..56282c3b1668ccabe7b203402a1844481bf670d5 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 50830957c65ed4e566260bb61108529140a8bb69..1f6d1a197b9148500e19c407686a6d4ec79f7442 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 64bff199290cda780ccc0b4de1e4b101d73b0c9c..546663e6895631099f421cbff7f159a3b43d76b8 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 d20f77b742d86352ad8754e3c406ccb0629c2102..e8a30891cca6bcf9040212f29afd37c05a4e1a80 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 3151b3c388b41f279dd2eaf56bb0831662aaeed9..48126c50419975abe8a874122807d31aadc9c4fd 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 24ee7d0db94efd8b6cfbdd9d30b473292379e3c4..e15b98ef9ef2bd6e039fbec2581d3890dee4d973 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 ca200fc6e6d85e425a474247dfb78309b971425f..f97aa8178ee988f4d0f5b858e19ffb1c32d0e721 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 dbf3a8232d7ed38326dded27e40ac8fe4836554f..7663bb6abf89eb0d423bc15947d977f5dcfc7a03 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 3cf953078a4295dd42e59ac9ab78a55d2db7eb8d..f414a30899d6efd18374be56ac08ed411eb73515 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 f78073fa0fcf59cdea70a729d2f8cdd56044e3ce..3f1653f0e3d654e68888d1998f04a96fe7716eef 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 a7414421d2b75ee7ee84c32ab8c53fff3a7d0112..9a7b056ac664c9c45eef2a855f5d940fc976faa1 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 b55d6065ad8914953d2267b88f1dd730f7e08603..8d30f1538402aeda27d3be96109c0638d56b8f3d 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 e6ddd72bf12208fb8dfa7d281abb5f8721b4f100..da59ce56dbf8b482cf96f9f4617c4a830d2c25ac 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",