diff --git a/ace_config.gni b/ace_config.gni index 8e2cd1f30c5a306a850b9177bb1d630ecb63df93..a585f3ee91c71867ad8adc2435633a2aab4642a4 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 2bb40acdde48fcff26bad3429e31c8efb80f6cd8..d95885f39fc9005a4558bf5867c6a6db5c85fc42 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 eb0bc02ac0a1e74b67f4ec7d5992fbf781e87529..9503bd0b5d359d93d3d1f2bdf3696d6684387d0d 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 4e63db58324da7b93cebec26c81fb214e7d0bef8..16597805639820324c4383269d1a7864700306e4 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 e4c13e3626f4ed7905e66a7e3f747ddd1e3f0a76..2677d2290ffd7457b5501c01f9bd1649f5807258 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 52c70b2bc0e8c9d863d6bb89425bf02b9c39df69..b2454cdcc9fe7e24d75ce861ceaf95f330d2986a 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 5ab708ad2cd2ac65bfc45494304a005bc8ead9ba..b0c40aa7683372b9f3c13a53aec673f9b424cb52 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 799724bdeb4a6f82ff9b982435d2fe559c673bef..ee8233acf52948346efb7c76b271fd855353b26d 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",