From d002c5e21d635751162ce31d8c7c881a0e433354 Mon Sep 17 00:00:00 2001 From: zhangbirong Date: Mon, 15 May 2023 19:59:12 +0800 Subject: [PATCH] change graphic_standard to graphic_2d Signed-off-by: zhangbirong Change-Id: I17ad0b47e72b18227940b28237821f4820280a64 --- ace_config.gni | 2 +- adapter/ohos/capability/BUILD.gn | 2 +- adapter/preview/sdk/sharedlib_config.gni | 8 ++++---- .../core/components_ng/pattern/window_scene/BUILD.gn | 2 +- interfaces/inner_api/form_render/BUILD.gn | 2 +- test/fuzztest/arkuiformrendergroup_fuzzer/BUILD.gn | 2 +- test/unittest/ace_unittest.gni | 2 +- test/unittest/interfaces/BUILD.gn | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ace_config.gni b/ace_config.gni index 8e2cd1f30c5..a585f3ee91c 100644 --- a/ace_config.gni +++ b/ace_config.gni @@ -83,7 +83,7 @@ ark_tools_root = "//prebuilts/ace-toolkit/ace-loader/panda" node_js_path = "//prebuilts/ace-toolkit/nodejs/node-v12.18.4-linux-x64/bin/" ark_toolchain_path = "//arkcompiler/toolchain" window_manager_path = "//foundation/window/window_manager" -graphic_standard_path = "//foundation/graphic/graphic_2d" +graphic_2d_path = "//foundation/graphic/graphic_2d" ark_ets_path = "//arkcompiler/ets_runtime" crossplatform_plugin_root = "//plugins" skia_root_new = "//third_party/skia" diff --git a/adapter/ohos/capability/BUILD.gn b/adapter/ohos/capability/BUILD.gn index 2bb40acdde4..d95885f39fc 100644 --- a/adapter/ohos/capability/BUILD.gn +++ b/adapter/ohos/capability/BUILD.gn @@ -57,7 +57,7 @@ template("ace_capability_ohos_source_set") { "bundle_framework:appexecfwk_base", "c_utils:utils", "eventhandler:libeventhandler", - "graphic_standard:surface", + "graphic_2d:surface", "hiviewdfx_hilog_native:libhilog", "input:libmmi-client", "ipc:ipc_core", diff --git a/adapter/preview/sdk/sharedlib_config.gni b/adapter/preview/sdk/sharedlib_config.gni index eb0bc02ac0a..9503bd0b5d3 100644 --- a/adapter/preview/sdk/sharedlib_config.gni +++ b/adapter/preview/sdk/sharedlib_config.gni @@ -84,22 +84,22 @@ common_bin = [ { label = "//foundation/graphic/graphic_2d/rosen/modules/glfw_render_context:libglfw_render_context" subsystem_name = "graphic" - part_name = "graphic_standard" + part_name = "graphic_2d" }, { label = "//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base" subsystem_name = "graphic" - part_name = "graphic_standard" + part_name = "graphic_2d" }, { label = "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client" subsystem_name = "graphic" - part_name = "graphic_standard" + part_name = "graphic_2d" }, { label = "//third_party/flutter/glfw:glfw" subsystem_name = "graphic" - part_name = "graphic_standard" + part_name = "graphic_2d" }, { label = "//third_party/flutter/build/skia:skia_shared" diff --git a/frameworks/core/components_ng/pattern/window_scene/BUILD.gn b/frameworks/core/components_ng/pattern/window_scene/BUILD.gn index 4e63db58324..16597805639 100644 --- a/frameworks/core/components_ng/pattern/window_scene/BUILD.gn +++ b/frameworks/core/components_ng/pattern/window_scene/BUILD.gn @@ -43,7 +43,7 @@ build_component_ng("window_scene") { if (is_ohos_standard_system) { configs = [ ":window_scene_config" ] - deps = [ "$graphic_standard_path/rosen/modules/render_service_client:librender_service_client" ] + deps = [ "$graphic_2d_path/rosen/modules/render_service_client:librender_service_client" ] external_deps = [ "ability_runtime:abilitykit_native", diff --git a/interfaces/inner_api/form_render/BUILD.gn b/interfaces/inner_api/form_render/BUILD.gn index e4c13e3626f..2677d2290ff 100644 --- a/interfaces/inner_api/form_render/BUILD.gn +++ b/interfaces/inner_api/form_render/BUILD.gn @@ -56,7 +56,7 @@ ohos_shared_library("ace_form_render") { "ace_engine:ace_uicontent", "c_utils:utils", "form_fwk:form_manager", - "graphic_standard:surface", + "graphic_2d:surface", "hiviewdfx_hilog_native:libhilog", "input:libmmi-client", "ipc:ipc_core", diff --git a/test/fuzztest/arkuiformrendergroup_fuzzer/BUILD.gn b/test/fuzztest/arkuiformrendergroup_fuzzer/BUILD.gn index 52c70b2bc0e..b2454cdcc9f 100644 --- a/test/fuzztest/arkuiformrendergroup_fuzzer/BUILD.gn +++ b/test/fuzztest/arkuiformrendergroup_fuzzer/BUILD.gn @@ -46,7 +46,7 @@ ohos_fuzztest("ArkuiFormRenderGroupFuzzTest") { "ace_engine:ace_uicontent", "c_utils:utils", "form_fwk:form_manager", - "graphic_standard:surface", + "graphic_2d:surface", "hiviewdfx_hilog_native:libhilog", "input:libmmi-client", "ipc:ipc_core", diff --git a/test/unittest/ace_unittest.gni b/test/unittest/ace_unittest.gni index 5ab708ad2cd..b0c40aa7683 100644 --- a/test/unittest/ace_unittest.gni +++ b/test/unittest/ace_unittest.gni @@ -71,7 +71,7 @@ template("ace_unittest") { } if (render) { - ace_unittest_deps += [ "$graphic_standard_path/rosen/modules/render_service_client:librender_service_client" ] + ace_unittest_deps += [ "$graphic_2d_path/rosen/modules/render_service_client:librender_service_client" ] } if (defined(invoker.flutter_skia)) { diff --git a/test/unittest/interfaces/BUILD.gn b/test/unittest/interfaces/BUILD.gn index 799724bdeb4..ee8233acf52 100644 --- a/test/unittest/interfaces/BUILD.gn +++ b/test/unittest/interfaces/BUILD.gn @@ -71,7 +71,7 @@ ohos_unittest("form_render_test") { "ace_engine:ace_uicontent", "c_utils:utils", "form_fwk:form_manager", - "graphic_standard:surface", + "graphic_2d:surface", "hiviewdfx_hilog_native:libhilog", "input:libmmi-client", "ipc:ipc_core", -- Gitee