openharmony/graphic_graphic_2d
1
0
Fork 0
mirror of https://gitee.com/openharmony/graphic_graphic_2d synced 2024-11-27 01:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix name

Browse Source 
Signed-off-by: zhangbirong <zhangbirong@huawei.com>
Change-Id: I6f98c8a595b52a49e2ffffecadec917d12f82674
This commit is contained in:
zhangbirong 2023-07-11 21:55:33 +08:00
parent 6e2d5158b0
commit fa0f5a7ce1
170 changed files with 325 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BUILD.gn
View File

@ -21,7 +21,7 @@ group("default") {
"rosen/modules/hyper_graphic_manager:hgm_policy_config.xml", "rosen/modules/hyper_graphic_manager:hgm_policy_config.xml",
] ]
if (graphic_standard_feature_bootanimation_enable) { if (graphic_2d_feature_bootanimation_enable) {
public_deps += [ "frameworks/bootanimation:bootanimation" ] public_deps += [ "frameworks/bootanimation:bootanimation" ]
public_deps += [ "frameworks/bootanimation:bootanimation_pics" ] public_deps += [ "frameworks/bootanimation:bootanimation_pics" ]
public_deps += [ "frameworks/bootanimation:bootanimation_sounds" ] public_deps += [ "frameworks/bootanimation:bootanimation_sounds" ]
@ -53,7 +53,7 @@ group("graphic_2d_test") {
ohos_prebuilt_etc("graphic.rc") { ohos_prebuilt_etc("graphic.rc") {
source = "graphic.cfg" source = "graphic.cfg"
relative_install_dir = "init" relative_install_dir = "init"
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
README_zh.md
View File

@ -1,4 +1,4 @@
# graphic_standard # graphic_2d
- [简介](#简介) - [简介](#简介)
- [目录](#目录) - [目录](#目录)

24
bundle.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@ohos/graphic_standard", "name": "@ohos/graphic_2d",
"description": "graphic_standard", "description": "graphic_2d",
"version": "3.1", "version": "3.1",
"license": "Apache License 2.0", "license": "Apache License 2.0",
"publishAs": "code-segment", "publishAs": "code-segment",
@ -10,7 +10,7 @@
"dirs": {}, "dirs": {},
"scripts": {}, "scripts": {},
"component": { "component": {
"name": "graphic_standard", "name": "graphic_2d",
"subsystem": "graphic", "subsystem": "graphic",
"syscap": [ "syscap": [
"SystemCapability.Graphic.Graphic2D.ColorManager.Core", "SystemCapability.Graphic.Graphic2D.ColorManager.Core",
@ -24,15 +24,15 @@
], ],
"adapted_system_type": [ "standard" ], "adapted_system_type": [ "standard" ],
"features": [ "features": [
"graphic_standard_feature_bootanimation_enable", "graphic_2d_feature_bootanimation_enable",
"graphic_standard_feature_ace_enable_gpu", "graphic_2d_feature_ace_enable_gpu",
"graphic_standard_feature_rs_enable_eglimage", "graphic_2d_feature_rs_enable_eglimage",
"graphic_standard_feature_color_gamut_enable", "graphic_2d_feature_color_gamut_enable",
"graphic_standard_feature_rs_enable_uni_render", "graphic_2d_feature_rs_enable_uni_render",
"graphic_standard_feature_wuji_enable", "graphic_2d_feature_wuji_enable",
"graphic_standard_feature_enable_afbc", "graphic_2d_feature_enable_afbc",
"graphic_standard_feature_freemem_enable", "graphic_2d_feature_freemem_enable",
"graphic_standard_feature_parallel_render_enable" "graphic_2d_feature_parallel_render_enable"
], ],
"rom": "10000KB", "rom": "10000KB",
"ram": "10000KB", "ram": "10000KB",

2
etc/BUILD.gn
View File

@ -15,6 +15,6 @@ import("//build/ohos.gni")
ohos_prebuilt_etc("ohos.para.dac") { ohos_prebuilt_etc("ohos.para.dac") {
source = "//foundation/graphic/graphic_2d/etc/graphic.para.dac" source = "//foundation/graphic/graphic_2d/etc/graphic.para.dac"
part_name = "graphic_standard" part_name = "graphic_2d"
module_install_dir = "etc/param" module_install_dir = "etc/param"
} }

8
frameworks/bootanimation/BUILD.gn
View File

@ -89,7 +89,7 @@ ohos_executable("bootanimation") {
external_deps += [ "startup:syspara" ] external_deps += [ "startup:syspara" ]
} }
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -99,21 +99,21 @@ ohos_executable("bootanimation") {
ohos_prebuilt_etc("bootanimation_pics") { ohos_prebuilt_etc("bootanimation_pics") {
source = "data/bootpic.zip" source = "data/bootpic.zip"
relative_install_dir = "graphic" relative_install_dir = "graphic"
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
ohos_prebuilt_etc("bootanimation_sounds") { ohos_prebuilt_etc("bootanimation_sounds") {
source = "data/bootsound.wav" source = "data/bootsound.wav"
relative_install_dir = "graphic" relative_install_dir = "graphic"
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
ohos_prebuilt_etc("bootanimation_video") { ohos_prebuilt_etc("bootanimation_video") {
source = "data/bootvideo.mp4" source = "data/bootvideo.mp4"
relative_install_dir = "graphic" relative_install_dir = "graphic"
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
## Install boot animation resource to /system/etc/graphic/ }}} ## Install boot animation resource to /system/etc/graphic/ }}}

2
frameworks/fence/BUILD.gn
View File

@ -40,7 +40,7 @@ ohos_shared_library("libfence") {
"hilog:libhilog", "hilog:libhilog",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

4
frameworks/fence/test/unittest/BUILD.gn
View File

@ -13,7 +13,7 @@
import("//build/test.gni") import("//build/test.gni")
module_out_path = "graphic_standard/fence" module_out_path = "graphic_2d/fence"
group("unittest") { group("unittest") {
testonly = true testonly = true
@ -57,6 +57,6 @@ ohos_static_library("fence_test_common") {
"//foundation/graphic/graphic_2d/utils:libgraphic_utils", "//foundation/graphic/graphic_2d/utils:libgraphic_utils",
] ]
subsystem_name = "graphic" subsystem_name = "graphic"
part_name = "graphic_standard" part_name = "graphic_2d"
} }
## Build fence_test_common.a }}} ## Build fence_test_common.a }}}

14
frameworks/opengl_wrapper/BUILD.gn
View File

@ -75,7 +75,7 @@ if (current_os != "ohos") {
output_extension = "so" output_extension = "so"
innerapi_tags = [ "platformsdk" ] innerapi_tags = [ "platformsdk" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
} }
@ -116,7 +116,7 @@ ohos_shared_library("GLESv1") {
output_name = "GLESv1" output_name = "GLESv1"
output_extension = "so" output_extension = "so"
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -156,7 +156,7 @@ ohos_shared_library("GLESv2") {
output_name = "GLESv2" output_name = "GLESv2"
output_extension = "so" output_extension = "so"
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -209,7 +209,7 @@ if (current_os != "ohos") {
output_extension = "so" output_extension = "so"
innerapi_tags = [ "platformsdk" ] innerapi_tags = [ "platformsdk" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
} }
@ -239,7 +239,7 @@ ohos_executable("opengl_wrapper_native_test") {
"hilog:libhilog", "hilog:libhilog",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -274,7 +274,7 @@ ohos_shared_library("debug_layer_test1") {
symlink_target_name = [ "libdebug_layer_test1.so" ] symlink_target_name = [ "libdebug_layer_test1.so" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -290,7 +290,7 @@ ohos_shared_library("debug_layer_test2") {
symlink_target_name = [ "libdebug_layer_test2.so" ] symlink_target_name = [ "libdebug_layer_test2.so" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
## Build libdebug_layer_test.so }}} ## Build libdebug_layer_test.so }}}

2
frameworks/opengl_wrapper/test/fuzztest/eglwrappercontext_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/opengl_wrapper" module_output_path = "graphic_2d/opengl_wrapper"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("EGLWrapperContextFuzzTest") { ohos_fuzztest("EGLWrapperContextFuzzTest") {

2
frameworks/opengl_wrapper/test/fuzztest/eglwrapperdisplay_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/opengl_wrapper" module_output_path = "graphic_2d/opengl_wrapper"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("EGLWrapperDisplayFuzzTest") { ohos_fuzztest("EGLWrapperDisplayFuzzTest") {

2
frameworks/opengl_wrapper/test/fuzztest/eglwrapperentry_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/opengl_wrapper" module_output_path = "graphic_2d/opengl_wrapper"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("EGLWrapperEntryFuzzTest") { ohos_fuzztest("EGLWrapperEntryFuzzTest") {

2
frameworks/opengl_wrapper/test/fuzztest/eglwrapperlayer_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/opengl_wrapper" module_output_path = "graphic_2d/opengl_wrapper"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("EGLWrapperLayerFuzzTest") { ohos_fuzztest("EGLWrapperLayerFuzzTest") {

2
frameworks/opengl_wrapper/test/fuzztest/eglwrapperloader_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/opengl_wrapper" module_output_path = "graphic_2d/opengl_wrapper"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("EGLWrapperLoaderFuzzTest") { ohos_fuzztest("EGLWrapperLoaderFuzzTest") {

2
frameworks/opengl_wrapper/test/fuzztest/eglwrapperobject_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/opengl_wrapper" module_output_path = "graphic_2d/opengl_wrapper"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("EGLWrapperObjectFuzzTest") { ohos_fuzztest("EGLWrapperObjectFuzzTest") {

2
frameworks/opengl_wrapper/test/fuzztest/eglwrappersurface_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/opengl_wrapper" module_output_path = "graphic_2d/opengl_wrapper"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("EGLWrapperSurfaceFuzzTest") { ohos_fuzztest("EGLWrapperSurfaceFuzzTest") {

2
frameworks/opengl_wrapper/test/systemtest/BUILD.gn
View File

@ -13,7 +13,7 @@
import("//build/test.gni") import("//build/test.gni")
module_out_path = "graphic_standard/opengl_wrapper" module_out_path = "graphic_2d/opengl_wrapper"
group("systemtest") { group("systemtest") {
testonly = true testonly = true

4
frameworks/opengl_wrapper/test/unittest/BUILD.gn
View File

@ -13,7 +13,7 @@
import("//build/test.gni") import("//build/test.gni")
module_out_path = "graphic_standard/opengl_wrapper" module_out_path = "graphic_2d/opengl_wrapper"
group("unittest") { group("unittest") {
testonly = true testonly = true
@ -65,5 +65,5 @@ ohos_static_library("opengl_wrapper_test_common") {
"//third_party/googletest:gtest_main", "//third_party/googletest:gtest_main",
] ]
subsystem_name = "graphic" subsystem_name = "graphic"
part_name = "graphic_standard" part_name = "graphic_2d"
} }

4
frameworks/surface/BUILD.gn
View File

@ -43,7 +43,7 @@ config("surface_public_config") {
if (ace_enable_gpu) { if (ace_enable_gpu) {
defines = [ "ACE_ENABLE_GPU" ] defines = [ "ACE_ENABLE_GPU" ]
} }
if (graphic_standard_feature_freemem_enable) { if (graphic_2d_feature_freemem_enable) {
defines += [ "SURFACE_ENABLE_FREEMEM" ] defines += [ "SURFACE_ENABLE_FREEMEM" ]
} }
defines += gpu_defines defines += gpu_defines
@ -118,7 +118,7 @@ ohos_shared_library("surface") {
"chipsetsdk", "chipsetsdk",
"platformsdk", "platformsdk",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
frameworks/surface/test/fuzztest/bufferqueue_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/surface" module_output_path = "graphic_2d/surface"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("BufferQueueFuzzTest") { ohos_fuzztest("BufferQueueFuzzTest") {

2
frameworks/surface/test/fuzztest/bufferutils_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/surface" module_output_path = "graphic_2d/surface"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("BufferUtilsFuzzTest") { ohos_fuzztest("BufferUtilsFuzzTest") {

2
frameworks/surface/test/fuzztest/nativebuffer_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/surface" module_output_path = "graphic_2d/surface"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("NativeBufferFuzzTest") { ohos_fuzztest("NativeBufferFuzzTest") {

2
frameworks/surface/test/fuzztest/nativewindow_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/surface" module_output_path = "graphic_2d/surface"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("NativeWindowFuzzTest") { ohos_fuzztest("NativeWindowFuzzTest") {

2
frameworks/surface/test/fuzztest/surface_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/surface" module_output_path = "graphic_2d/surface"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("SurfaceFuzzTest") { ohos_fuzztest("SurfaceFuzzTest") {

2
frameworks/surface/test/fuzztest/surfacebuffer_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/surface" module_output_path = "graphic_2d/surface"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("SurfaceBufferFuzzTest") { ohos_fuzztest("SurfaceBufferFuzzTest") {

2
frameworks/surface/test/fuzztest/surfaceutils_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/surface" module_output_path = "graphic_2d/surface"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("SurfaceUtilsFuzzTest") { ohos_fuzztest("SurfaceUtilsFuzzTest") {

2
frameworks/surface/test/systemtest/BUILD.gn
View File

@ -13,7 +13,7 @@
import("//build/test.gni") import("//build/test.gni")
module_out_path = "graphic_standard/surface" module_out_path = "graphic_2d/surface"
group("systemtest") { group("systemtest") {
testonly = true testonly = true

4
frameworks/surface/test/unittest/BUILD.gn
View File

@ -14,7 +14,7 @@
import("//build/test.gni") import("//build/test.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni")
module_out_path = "graphic_standard/surface" module_out_path = "graphic_2d/surface"
group("unittest") { group("unittest") {
testonly = true testonly = true
@ -233,6 +233,6 @@ ohos_static_library("surface_test_common") {
"//third_party/googletest:gtest_main", "//third_party/googletest:gtest_main",
] ]
subsystem_name = "graphic" subsystem_name = "graphic"
part_name = "graphic_standard" part_name = "graphic_2d"
} }
## Build surface_test_common.a }}} ## Build surface_test_common.a }}}

2
frameworks/surfaceimage/BUILD.gn
View File

@ -66,7 +66,7 @@ ohos_shared_library("libnative_image") {
"ipc:ipc_single", "ipc:ipc_single",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
## Build libnative_image.so }}} ## Build libnative_image.so }}}

4
frameworks/vulkan_layers/BUILD.gn
View File

@ -58,7 +58,7 @@ ohos_shared_library("vulkan_swapchain_layer") {
output_name = "vulkan_swapchain" output_name = "vulkan_swapchain"
output_extension = "so" output_extension = "so"
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -67,7 +67,7 @@ ohos_shared_library("vulkan_swapchain_layer") {
## Build VkLayer_swapchain.json {{{ ## Build VkLayer_swapchain.json {{{
ohos_prebuilt_etc("vulkan_swapchain_layer_json") { ohos_prebuilt_etc("vulkan_swapchain_layer_json") {
source = "swapchain_layer/VkLayer_swapchain.json" source = "swapchain_layer/VkLayer_swapchain.json"
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
module_install_dir = "etc/vulkan/implicit_layer.d" module_install_dir = "etc/vulkan/implicit_layer.d"
} }

6
frameworks/vulkan_layers/test/fuzztest/swapchainlayer_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/vulkan_layers" module_output_path = "graphic_2d/vulkan_layers"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("SwapchainLayerFuzzTest") { ohos_fuzztest("SwapchainLayerFuzzTest") {
@ -30,8 +30,8 @@ ohos_fuzztest("SwapchainLayerFuzzTest") {
] ]
public_deps = [ "//third_party/vulkan-headers:vulkan_headers" ] public_deps = [ "//third_party/vulkan-headers:vulkan_headers" ]
external_deps = [ external_deps = [
"graphic_standard:surface", "graphic_2d:surface",
"graphic_standard:sync_fence", "graphic_2d:sync_fence",
"ipc:ipc_single", "ipc:ipc_single",
] ]
sources = [ "swapchainlayer_fuzzer.cpp" ] sources = [ "swapchainlayer_fuzzer.cpp" ]

4
frameworks/vulkan_layers/test/systemtest/BUILD.gn
View File

@ -13,7 +13,7 @@
import("//build/test.gni") import("//build/test.gni")
module_out_path = "graphic_standard/vulkan_layers" module_out_path = "graphic_2d/vulkan_layers"
group("systemtest") { group("systemtest") {
testonly = true testonly = true
@ -62,5 +62,5 @@ ohos_static_library("vulkan_loader_test_common") {
] ]
subsystem_name = "graphic" subsystem_name = "graphic"
part_name = "graphic_standard" part_name = "graphic_2d"
} }

4
frameworks/vulkan_layers/test/unittest/BUILD.gn
View File

@ -13,7 +13,7 @@
import("//build/test.gni") import("//build/test.gni")
module_out_path = "graphic_standard/vulkan_layers" module_out_path = "graphic_2d/vulkan_layers"
group("unittest") { group("unittest") {
testonly = true testonly = true
@ -61,5 +61,5 @@ ohos_static_library("vulkan_loader_test_common") {
"//third_party/zlib:libz", "//third_party/zlib:libz",
] ]
subsystem_name = "graphic" subsystem_name = "graphic"
part_name = "graphic_standard" part_name = "graphic_2d"
} }

37
graphic_config.gni
View File

@ -12,16 +12,16 @@
# limitations under the License. # limitations under the License.
declare_args() { declare_args() {
graphic_standard_feature_bootanimation_enable = true graphic_2d_feature_bootanimation_enable = true
graphic_standard_feature_ace_enable_gpu = true graphic_2d_feature_ace_enable_gpu = true
graphic_standard_feature_color_gamut_enable = false graphic_2d_feature_color_gamut_enable = false
graphic_standard_feature_rs_enable_eglimage = false graphic_2d_feature_rs_enable_eglimage = false
graphic_standard_feature_rs_enable_uni_render = false graphic_2d_feature_rs_enable_uni_render = false
graphic_standard_feature_wuji_enable = false graphic_2d_feature_wuji_enable = false
graphic_standard_feature_enable_afbc = false graphic_2d_feature_enable_afbc = false
graphic_standard_feature_freemem_enable = false graphic_2d_feature_freemem_enable = false
graphic_standard_feature_parallel_render_enable = true graphic_2d_feature_parallel_render_enable = true
graphic_standard_feature_enable_vulkan = false graphic_2d_feature_enable_vulkan = false
if (defined(build_cross_platform_version) && build_cross_platform_version) { if (defined(build_cross_platform_version) && build_cross_platform_version) {
use_new_render_context = false use_new_render_context = false
} else { } else {
@ -31,8 +31,8 @@ declare_args() {
gpu_defines = [] gpu_defines = []
accessibility_defines = [] accessibility_defines = []
if (graphic_standard_feature_ace_enable_gpu) { if (graphic_2d_feature_ace_enable_gpu) {
if (graphic_standard_feature_enable_vulkan) { if (graphic_2d_feature_enable_vulkan) {
gpu_defines += [ gpu_defines += [
"ACE_ENABLE_VK", "ACE_ENABLE_VK",
"RS_ENABLE_VK", "RS_ENABLE_VK",
@ -55,7 +55,7 @@ if (graphic_standard_feature_ace_enable_gpu) {
] ]
libvulkan = [] libvulkan = []
if (graphic_standard_feature_enable_vulkan) { if (graphic_2d_feature_enable_vulkan) {
libvulkan += [ libvulkan += [
"//third_party/flutter/engine/flutter/vulkan:vulkan_flutter", "//third_party/flutter/engine/flutter/vulkan:vulkan_flutter",
"//third_party/vulkan-loader/openharmony:vulkan_loader", "//third_party/vulkan-loader/openharmony:vulkan_loader",
@ -70,8 +70,8 @@ if (graphic_standard_feature_ace_enable_gpu) {
libvulkan = [] libvulkan = []
} }
if ((graphic_standard_feature_rs_enable_eglimage && if ((graphic_2d_feature_rs_enable_eglimage &&
!graphic_standard_feature_enable_vulkan) || current_os == "android") { !graphic_2d_feature_enable_vulkan) || current_os == "android") {
gpu_defines += [ gpu_defines += [
"RS_ENABLE_EGLIMAGE", "RS_ENABLE_EGLIMAGE",
"RS_ENABLE_EGLQUERYSURFACE", "RS_ENABLE_EGLQUERYSURFACE",
@ -82,7 +82,7 @@ if ((graphic_standard_feature_rs_enable_eglimage &&
rs_enable_eglimage = false rs_enable_eglimage = false
} }
if (graphic_standard_feature_rs_enable_uni_render) { if (graphic_2d_feature_rs_enable_uni_render) {
rs_enable_driven_render = true rs_enable_driven_render = true
gpu_defines += [ gpu_defines += [
"RS_ENABLE_DRIVEN_RENDER", "RS_ENABLE_DRIVEN_RENDER",
@ -92,12 +92,11 @@ if (graphic_standard_feature_rs_enable_uni_render) {
rs_enable_driven_render = false rs_enable_driven_render = false
} }
if (graphic_standard_feature_enable_afbc && if (graphic_2d_feature_enable_afbc && !graphic_2d_feature_enable_vulkan) {
!graphic_standard_feature_enable_vulkan) {
gpu_defines += [ "RS_ENABLE_AFBC" ] gpu_defines += [ "RS_ENABLE_AFBC" ]
} }
if (graphic_standard_feature_parallel_render_enable) { if (graphic_2d_feature_parallel_render_enable) {
rs_enable_parallel_render = true rs_enable_parallel_render = true
gpu_defines += [ "RS_ENABLE_PARALLEL_RENDER" ] gpu_defines += [ "RS_ENABLE_PARALLEL_RENDER" ]
} }

2
interfaces/kits/js/declaration/BUILD.gn
View File

@ -16,7 +16,7 @@ import("//build/ohos/ace/ace.gni")
js_declaration("window") { js_declaration("window") {
sources = [ "./api" ] sources = [ "./api" ]
part_name = "graphic_standard" part_name = "graphic_2d"
} }
ohos_copy("window_declaration") { ohos_copy("window_declaration") {

2
interfaces/kits/napi/graphic/animation/window_animation_manager/BUILD.gn
View File

@ -59,6 +59,6 @@ ohos_shared_library("windowanimationmanager_napi") {
} }
relative_install_dir = "module/animation" relative_install_dir = "module/animation"
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

4
interfaces/kits/napi/graphic/color_manager/BUILD.gn
View File

@ -42,7 +42,7 @@ ohos_shared_library("color_space_object_convertor") {
cflags_cc = [ "-std=c++17" ] cflags_cc = [ "-std=c++17" ]
innerapi_tags = [ "platformsdk" ] innerapi_tags = [ "platformsdk" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -78,6 +78,6 @@ ohos_shared_library("colorspacemanager_napi") {
cflags_cc = [ "-std=c++17" ] cflags_cc = [ "-std=c++17" ]
relative_install_dir = "module/graphics" relative_install_dir = "module/graphics"
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
interfaces/kits/napi/graphic/effect_kit/BUILD.gn
View File

@ -79,7 +79,7 @@ ohos_shared_library("effectkit") {
cflags_cc = [ "-std=c++17" ] cflags_cc = [ "-std=c++17" ]
relative_install_dir = "module" relative_install_dir = "module"
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
## Build effect_kit.so ## Build effect_kit.so

2
interfaces/kits/napi/graphic/hyper_graphic_manager/BUILD.gn
View File

@ -52,6 +52,6 @@ ohos_shared_library("libhgmnapi") {
] ]
relative_install_dir = "module" relative_install_dir = "module"
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

4
interfaces/kits/napi/graphic/webgl/BUILD.gn
View File

@ -87,7 +87,7 @@ ohos_source_set("webgl_src") {
configs = [ ":render_config" ] configs = [ ":render_config" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -99,6 +99,6 @@ ohos_shared_library("libwebglnapi") {
} else { } else {
install_enable = false install_enable = false
} }
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
rosen/build/flutter/icu/BUILD.gn
View File

@ -116,7 +116,7 @@ template("rosen_libicu") {
forward_variables_from(invoker, "*") forward_variables_from(invoker, "*")
ohos_source_set(target_name) { ohos_source_set(target_name) {
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
public_configs = [ ":icu_config_$platform" ] public_configs = [ ":icu_config_$platform" ]
configs = [ ":icu_compile_flags" ] configs = [ ":icu_compile_flags" ]

8
rosen/modules/2d_engine/rosen_text/BUILD.gn
View File

@ -39,14 +39,14 @@ ohos_shared_library("rosen_text") {
deps = [ "$graphic_2d_root/rosen/modules/2d_graphics:2d_graphics_new" ] deps = [ "$graphic_2d_root/rosen/modules/2d_graphics:2d_graphics_new" ]
} }
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
ohos_source_set("rosen_text_inner") { ohos_source_set("rosen_text_inner") {
public_deps = [ ":rosen_text_txt" ] public_deps = [ ":rosen_text_txt" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -75,7 +75,7 @@ ohos_source_set("rosen_text_texgine") {
"$graphic_2d_root/rosen/modules/texgine/texgine_drawing:libtexgine_drawing", "$graphic_2d_root/rosen/modules/texgine/texgine_drawing:libtexgine_drawing",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -118,6 +118,6 @@ ohos_source_set("rosen_text_txt") {
deps += [ "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform" ] deps += [ "$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

10
rosen/modules/2d_graphics/BUILD.gn
View File

@ -157,7 +157,7 @@ template("graphics2d_source_set") {
} }
deps += [ "$rosen_root/modules/2d_engine/rosen_text:rosen_text_inner" ] deps += [ "$rosen_root/modules/2d_engine/rosen_text:rosen_text_inner" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
} }
@ -194,7 +194,7 @@ if (!is_cross_platform_build) {
deps = [ ":2d_graphics_source_ohos" ] deps = [ ":2d_graphics_source_ohos" ]
public_configs = [ ":2d_graphics_config" ] public_configs = [ ":2d_graphics_config" ]
innerapi_tags = [ "platformsdk_indirect" ] innerapi_tags = [ "platformsdk_indirect" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
} }
@ -207,7 +207,7 @@ ohos_shared_library("2d_graphics_new") {
deps = [ ":2d_graphics_source_$platform" ] deps = [ ":2d_graphics_source_$platform" ]
public_configs = [ ":2d_graphics_config" ] public_configs = [ ":2d_graphics_config" ]
innerapi_tags = [ "platformsdk_indirect" ] innerapi_tags = [ "platformsdk_indirect" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -268,7 +268,7 @@ ohos_shared_library("2d_graphics_canvaskit0310") {
external_deps = [ "hilog:libhilog" ] external_deps = [ "hilog:libhilog" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -307,6 +307,6 @@ ohos_shared_library("2d_graphics_drawing") {
} }
deps = [ "$rosen_root/modules/2d_engine/rosen_text:rosen_text_inner" ] deps = [ "$rosen_root/modules/2d_engine/rosen_text:rosen_text_inner" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
rosen/modules/animation/window_animation/BUILD.gn
View File

@ -40,6 +40,6 @@ ohos_shared_library("window_animation") {
] ]
innerapi_tags = [ "platformsdk" ] innerapi_tags = [ "platformsdk" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
rosen/modules/animation/window_animation/test/unittest/BUILD.gn
View File

@ -12,7 +12,7 @@
# limitations under the License. # limitations under the License.
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/rosen/modules/animation/window_animation" module_output_path = "graphic_2d/rosen/modules/animation/window_animation"
ohos_unittest("RSWindowAnimationTest") { ohos_unittest("RSWindowAnimationTest") {
module_out_path = module_output_path module_out_path = module_output_path

2
rosen/modules/composer/BUILD.gn
View File

@ -78,7 +78,7 @@ ohos_shared_library("libcomposer") {
"ipc:ipc_core", "ipc:ipc_core",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
rosen/modules/composer/hdi_backend/test/fuzztest/hdibackend_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/composer" module_output_path = "graphic_2d/composer"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("HdiBackendFuzzTest") { ohos_fuzztest("HdiBackendFuzzTest") {

2
rosen/modules/composer/hdi_backend/test/fuzztest/hdidevice_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/composer" module_output_path = "graphic_2d/composer"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("HdiDeviceFuzzTest") { ohos_fuzztest("HdiDeviceFuzzTest") {

2
rosen/modules/composer/hdi_backend/test/fuzztest/hdilayer_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/composer" module_output_path = "graphic_2d/composer"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("HdiLayerFuzzTest") { ohos_fuzztest("HdiLayerFuzzTest") {

2
rosen/modules/composer/hdi_backend/test/fuzztest/hdioutput_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/composer" module_output_path = "graphic_2d/composer"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("HdiOutputFuzzTest") { ohos_fuzztest("HdiOutputFuzzTest") {

2
rosen/modules/composer/hdi_backend/test/fuzztest/hdiscreen_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/composer" module_output_path = "graphic_2d/composer"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("HdiScreenFuzzTest") { ohos_fuzztest("HdiScreenFuzzTest") {

2
rosen/modules/composer/hdi_backend/test/systemtest/BUILD.gn
View File

@ -13,7 +13,7 @@
import("//build/test.gni") import("//build/test.gni")
module_out_path = "graphic_standard/composer" module_out_path = "graphic_2d/composer"
group("systemtest") { group("systemtest") {
testonly = true testonly = true

6
rosen/modules/composer/hdi_backend/test/systemtest/hdilayer_context_systest.h
View File

@ -13,8 +13,8 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef GRAPHIC_STANDARD_COMPOSER_LAYER_CONTEXT_MOCK_H #ifndef graphic_2d_COMPOSER_LAYER_CONTEXT_MOCK_H
#define GRAPHIC_STANDARD_COMPOSER_LAYER_CONTEXT_MOCK_H #define graphic_2d_COMPOSER_LAYER_CONTEXT_MOCK_H
#include "hdi_layer.h" #include "hdi_layer.h"
@ -40,4 +40,4 @@ private:
} // namespace MockSys } // namespace MockSys
} // namespace Rosen } // namespace Rosen
} // namespace OHOS } // namespace OHOS
#endif // GRAPHIC_STANDARD_COMPOSER_LAYER_CONTEXT_MOCK_H #endif // graphic_2d_COMPOSER_LAYER_CONTEXT_MOCK_H

6
rosen/modules/composer/hdi_backend/test/systemtest/mock_hdi_device_systest.h
View File

@ -13,8 +13,8 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef GRAPHIC_STANDARD_COMPOSER_HDIDEVICE_MOCK_H #ifndef graphic_2d_COMPOSER_HDIDEVICE_MOCK_H
#define GRAPHIC_STANDARD_COMPOSER_HDIDEVICE_MOCK_H #define graphic_2d_COMPOSER_HDIDEVICE_MOCK_H
#include "hdi_device.h" #include "hdi_device.h"
@ -91,4 +91,4 @@ public:
} // namespace MockSys } // namespace MockSys
} // namespace Rosen } // namespace Rosen
} // namespace OHOS } // namespace OHOS
#endif // GRAPHIC_STANDARD_COMPOSER_HDIDEVICE_MOCK_H #endif // graphic_2d_COMPOSER_HDIDEVICE_MOCK_H

2
rosen/modules/composer/hdi_backend/test/unittest/BUILD.gn
View File

@ -14,7 +14,7 @@
import("//build/test.gni") import("//build/test.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni")
module_out_path = "graphic_standard/composer" module_out_path = "graphic_2d/composer"
group("unittest") { group("unittest") {
testonly = true testonly = true

6
rosen/modules/composer/hdi_backend/test/unittest/mock_hdi_device.h
View File

@ -13,8 +13,8 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef GRAPHIC_STANDARD_COMPOSER_HDIDEVICE_MOCK_H #ifndef graphic_2d_COMPOSER_HDIDEVICE_MOCK_H
#define GRAPHIC_STANDARD_COMPOSER_HDIDEVICE_MOCK_H #define graphic_2d_COMPOSER_HDIDEVICE_MOCK_H
#include "hdi_device.h" #include "hdi_device.h"
@ -91,4 +91,4 @@ public:
} // namespace Mock } // namespace Mock
} // namespace Rosen } // namespace Rosen
} // namespace OHOS } // namespace OHOS
#endif // GRAPHIC_STANDARD_COMPOSER_HDIDEVICE_MOCK_H #endif // graphic_2d_COMPOSER_HDIDEVICE_MOCK_H

2
rosen/modules/composer/native_vsync/BUILD.gn
View File

@ -52,7 +52,7 @@ ohos_shared_library("libnative_vsync") {
external_deps = [ "hilog:libhilog" ] external_deps = [ "hilog:libhilog" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
## Build libnative_vsync.so ## Build libnative_vsync.so

2
rosen/modules/composer/vsync/BUILD.gn
View File

@ -82,7 +82,7 @@ ohos_shared_library("libvsync") {
} }
innerapi_tags = [ "platformsdk" ] innerapi_tags = [ "platformsdk" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
rosen/modules/composer/vsync/test/fuzztest/vsyncconnection_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/composer" module_output_path = "graphic_2d/composer"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("VsyncConnectionFuzzTest") { ohos_fuzztest("VsyncConnectionFuzzTest") {

2
rosen/modules/composer/vsync/test/fuzztest/vsynccontroller_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/composer" module_output_path = "graphic_2d/composer"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("VsyncControllerFuzzTest") { ohos_fuzztest("VsyncControllerFuzzTest") {

2
rosen/modules/composer/vsync/test/fuzztest/vsyncdistributor_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/composer" module_output_path = "graphic_2d/composer"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("VsyncDistributorFuzzTest") { ohos_fuzztest("VsyncDistributorFuzzTest") {

2
rosen/modules/composer/vsync/test/fuzztest/vsyncreceiver_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/composer" module_output_path = "graphic_2d/composer"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("VsyncReceiverFuzzTest") { ohos_fuzztest("VsyncReceiverFuzzTest") {

2
rosen/modules/composer/vsync/test/fuzztest/vsyncsampler_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/composer" module_output_path = "graphic_2d/composer"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("VsyncSamplerFuzzTest") { ohos_fuzztest("VsyncSamplerFuzzTest") {

2
rosen/modules/composer/vsync/test/systemtest/BUILD.gn
View File

@ -13,7 +13,7 @@
import("//build/test.gni") import("//build/test.gni")
module_out_path = "graphic_standard/composer" module_out_path = "graphic_2d/composer"
group("systemtest") { group("systemtest") {
testonly = true testonly = true

4
rosen/modules/composer/vsync/test/unittest/BUILD.gn
View File

@ -13,7 +13,7 @@
import("//build/test.gni") import("//build/test.gni")
module_out_path = "graphic_standard/composer" module_out_path = "graphic_2d/composer"
group("unittest") { group("unittest") {
testonly = true testonly = true
@ -148,6 +148,6 @@ ohos_static_library("vsync_test_common") {
"//third_party/googletest:gtest_main", "//third_party/googletest:gtest_main",
] ]
subsystem_name = "graphic" subsystem_name = "graphic"
part_name = "graphic_standard" part_name = "graphic_2d"
} }
## Build vsync_test_common.a }}} ## Build vsync_test_common.a }}}

2
rosen/modules/effect/color_picker/BUILD.gn
View File

@ -64,7 +64,7 @@ ohos_shared_library("color_picker") {
cflags_cc = [ "-std=c++17" ] cflags_cc = [ "-std=c++17" ]
innerapi_tags = [ "platformsdk" ] innerapi_tags = [ "platformsdk" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
## Build color_picker.so ## Build color_picker.so

2
rosen/modules/effect/effectChain/BUILD.gn
View File

@ -91,6 +91,6 @@ ohos_shared_library("libeffectchain") {
install_enable = false install_enable = false
} }
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
rosen/modules/effect/egl/BUILD.gn
View File

@ -58,6 +58,6 @@ ohos_shared_library("libegl_effect") {
} }
innerapi_tags = [ "platformsdk_indirect" ] innerapi_tags = [ "platformsdk_indirect" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
rosen/modules/effect/skia_effectChain/BUILD.gn
View File

@ -86,6 +86,6 @@ ohos_shared_library("skeffectchain") {
install_enable = true install_enable = true
innerapi_tags = [ "platformsdk" ] innerapi_tags = [ "platformsdk" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
rosen/modules/effect/test/BUILD.gn
View File

@ -49,6 +49,6 @@ ohos_executable("test_effect_chain") {
install_enable = false install_enable = false
} }
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
rosen/modules/effect/test/unittest/BUILD.gn
View File

@ -15,7 +15,7 @@ import("//build/test.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni")
import("//foundation/graphic/graphic_2d/rosen/modules/effect/effect_config.gni") import("//foundation/graphic/graphic_2d/rosen/modules/effect/effect_config.gni")
module_output_path = "graphic_standard/rosen/modules/effect" module_output_path = "graphic_2d/rosen/modules/effect"
ohos_unittest("EffectTest") { ohos_unittest("EffectTest") {
module_out_path = module_output_path module_out_path = module_output_path

2
rosen/modules/frame_analyzer/BUILD.gn
View File

@ -75,6 +75,6 @@ ohos_shared_library("libframe_analyzer") {
subsystem_name = "graphic" subsystem_name = "graphic"
innerapi_tags = [ "platformsdk_indirect" ] innerapi_tags = [ "platformsdk_indirect" ]
part_name = "graphic_standard" part_name = "graphic_2d"
} }
## Build libframe_analyzer.so }}} ## Build libframe_analyzer.so }}}

2
rosen/modules/glfw_render_context/BUILD.gn
View File

@ -42,7 +42,7 @@ ohos_shared_library("libglfw_render_context") {
"//third_party/flutter/glfw:glfw", "//third_party/flutter/glfw:glfw",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
## Build libglfw_render_context.so }}} ## Build libglfw_render_context.so }}}

4
rosen/modules/hyper_graphic_manager/BUILD.gn
View File

@ -50,7 +50,7 @@ ohos_shared_library("libhyper_graphic_manager") {
"init:libbegetutil", "init:libbegetutil",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
if (is_standard_system) { if (is_standard_system) {
@ -63,6 +63,6 @@ ohos_shared_library("libhyper_graphic_manager") {
ohos_prebuilt_etc("hgm_policy_config.xml") { ohos_prebuilt_etc("hgm_policy_config.xml") {
source = "config/include/hgm_policy_config.xml" source = "config/include/hgm_policy_config.xml"
relative_install_dir = "graphic" relative_install_dir = "graphic"
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

8
rosen/modules/platform/BUILD.gn
View File

@ -59,7 +59,7 @@ ohos_source_set("impl_eventhandler") {
":utils", ":utils",
"//third_party/libuv:uv", "//third_party/libuv:uv",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -95,7 +95,7 @@ ohos_source_set("mock_image_native") {
public_configs = [ ":image_native_config" ] public_configs = [ ":image_native_config" ]
sources = [ "image_native/pixel_map.cpp" ] sources = [ "image_native/pixel_map.cpp" ]
deps = [ ":utils" ] deps = [ ":utils" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -125,7 +125,7 @@ ohos_source_set("mock_ipc_core") {
"ipc_core/peer_holder.cpp", "ipc_core/peer_holder.cpp",
] ]
deps = [ ":utils" ] deps = [ ":utils" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -166,7 +166,7 @@ ohos_source_set("mock_utils") {
] ]
public_deps = [ "//third_party/bounds_checking_function:libsec_shared" ] public_deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
} }
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
# utils }}} # utils }}}

2
rosen/modules/render_frame_trace/BUILD.gn
View File

@ -30,6 +30,6 @@ ohos_source_set("render_frame_trace") {
} }
} }
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

8
rosen/modules/render_service/BUILD.gn
View File

@ -18,7 +18,7 @@ import("$graphic_2d_root/rosen/modules/render_service_base/config.gni")
## Build librender_service.so ## Build librender_service.so
ohos_shared_library("librender_service") { ohos_shared_library("librender_service") {
defines = [] defines = []
if (graphic_standard_feature_color_gamut_enable) { if (graphic_2d_feature_color_gamut_enable) {
defines += [ "PADDING_HEIGHT_32" ] defines += [ "PADDING_HEIGHT_32" ]
} else { } else {
defines += [] defines += []
@ -134,7 +134,7 @@ ohos_shared_library("librender_service") {
} }
if (rs_enable_gpu) { if (rs_enable_gpu) {
if (graphic_standard_feature_enable_vulkan) { if (graphic_2d_feature_enable_vulkan) {
include_dirs += [ "//third_party/flutter/engine/flutter/vulkan" ] include_dirs += [ "//third_party/flutter/engine/flutter/vulkan" ]
} }
@ -174,7 +174,7 @@ ohos_shared_library("librender_service") {
defines += accessibility_defines defines += accessibility_defines
} }
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -194,6 +194,6 @@ ohos_executable("render_service") {
"$graphic_2d_root/rosen/modules/render_service_base:librender_service_base", "$graphic_2d_root/rosen/modules/render_service_base:librender_service_base",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

6
rosen/modules/render_service_base/BUILD.gn
View File

@ -240,7 +240,7 @@ ohos_source_set("render_service_base_src") {
sources += graphic_2d_ext_configs.librender_service_base_ext_sources sources += graphic_2d_ext_configs.librender_service_base_ext_sources
} }
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -262,7 +262,7 @@ ohos_shared_library("librender_service_base") {
} }
innerapi_tags = [ "platformsdk_indirect" ] innerapi_tags = [ "platformsdk_indirect" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -278,6 +278,6 @@ ohos_source_set("librender_service_base_static") {
public_deps += [ "src/render_backend:librender_backend" ] public_deps += [ "src/render_backend:librender_backend" ]
} }
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

6
rosen/modules/render_service_base/src/platform/ohos/BUILD.gn
View File

@ -81,7 +81,7 @@ ohos_source_set("rosen_ohos_sources") {
"backend/rs_surface_ohos_gl.cpp", "backend/rs_surface_ohos_gl.cpp",
] ]
if (graphic_standard_feature_enable_vulkan) { if (graphic_2d_feature_enable_vulkan) {
sources += [ sources += [
"backend/rs_surface_frame_ohos_vulkan.cpp", "backend/rs_surface_frame_ohos_vulkan.cpp",
"backend/rs_surface_ohos_vulkan.cpp", "backend/rs_surface_ohos_vulkan.cpp",
@ -136,7 +136,7 @@ ohos_source_set("rosen_ohos_sources") {
include_dirs += [ "//third_party/flutter/skia" ] include_dirs += [ "//third_party/flutter/skia" ]
} }
if (graphic_standard_feature_enable_vulkan) { if (graphic_2d_feature_enable_vulkan) {
include_dirs += [ "//third_party/flutter/engine/flutter/vulkan" ] include_dirs += [ "//third_party/flutter/engine/flutter/vulkan" ]
} }
public_deps += [ public_deps += [
@ -190,6 +190,6 @@ ohos_source_set("rosen_ohos_sources") {
defines += [ "RES_SCHED_ENABLE" ] defines += [ "RES_SCHED_ENABLE" ]
} }
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

4
rosen/modules/render_service_base/src/render_backend/BUILD.gn
View File

@ -72,7 +72,7 @@ ohos_static_library("librender_backend") {
include_dirs += [ "//third_party/flutter/skia" ] include_dirs += [ "//third_party/flutter/skia" ]
} }
if (graphic_standard_feature_enable_vulkan) { if (graphic_2d_feature_enable_vulkan) {
include_dirs += [ "//third_party/flutter/engine/flutter/vulkan" ] include_dirs += [ "//third_party/flutter/engine/flutter/vulkan" ]
sources += [ "ohos/render_context_ohos_vk.cpp" ] sources += [ "ohos/render_context_ohos_vk.cpp" ]
} }
@ -103,6 +103,6 @@ ohos_static_library("librender_backend") {
"samgr:samgr_proxy", "samgr:samgr_proxy",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
rosen/modules/render_service_base/test/BUILD.gn
View File

@ -29,6 +29,6 @@ ohos_executable("render_service_client") {
deps = [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base" ] deps = [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
rosen/modules/render_service_base/test/fuzztest/rsanimationbase_fuzzer/BUILD.gn
View File

@ -14,7 +14,7 @@
#####################hydra-fuzz################### #####################hydra-fuzz###################
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
module_output_path = "graphic_standard/modules/render_service_base" module_output_path = "graphic_2d/modules/render_service_base"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("RSAnimationBaseFuzzTest") { ohos_fuzztest("RSAnimationBaseFuzzTest") {

2
rosen/modules/render_service_base/test/unittest/animation/BUILD.gn
View File

@ -15,7 +15,7 @@ import("//build/test.gni")
import( import(
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client/render_service_client.gni") "//foundation/graphic/graphic_2d/rosen/modules/render_service_client/render_service_client.gni")
module_output_path = "graphic_standard/rosen/modules/render_service_base" module_output_path = "graphic_2d/rosen/modules/render_service_base"
ohos_unittest("RSRenderAnimationTest") { ohos_unittest("RSRenderAnimationTest") {
module_out_path = module_output_path module_out_path = module_output_path

6
rosen/modules/render_service_client/BUILD.gn
View File

@ -178,7 +178,7 @@ template("render_service_client_source_set") {
public_configs = [ ":render_service_client_config" ] public_configs = [ ":render_service_client_config" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
} }
@ -194,14 +194,14 @@ render_service_client_source_set("render_service_client_src_static") {
ohos_shared_library("librender_service_client") { ohos_shared_library("librender_service_client") {
public_deps = [ ":render_service_client_src" ] public_deps = [ ":render_service_client_src" ]
innerapi_tags = [ "platformsdk" ] innerapi_tags = [ "platformsdk" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
ohos_source_set("librender_service_client_static") { ohos_source_set("librender_service_client_static") {
public_deps = [ ":render_service_client_src_static" ] public_deps = [ ":render_service_client_src_static" ]
deps = [ "$rosen_root/modules/platform:eventhandler" ] deps = [ "$rosen_root/modules/platform:eventhandler" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
rosen/modules/render_service_client/core/animation/test/unittest/animation/BUILD.gn
View File

@ -17,7 +17,7 @@ import(
#import("//foundation/graphic/graphic_2d/rosen/modules/render_service_base/config.gni") #import("//foundation/graphic/graphic_2d/rosen/modules/render_service_base/config.gni")
module_output_path = "graphic_standard/rosen/modules/render_service_client" module_output_path = "graphic_2d/rosen/modules/render_service_client"
ohos_unittest("RSAnimationTest") { ohos_unittest("RSAnimationTest") {
module_out_path = module_output_path module_out_path = module_output_path

48
rosen/modules/render_service_client/test/BUILD.gn
View File

@ -51,7 +51,7 @@ ohos_executable("render_service_client_rs_demo") {
public_deps = [ "$public_deps_skia" ] public_deps = [ "$public_deps_skia" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -65,7 +65,7 @@ ohos_executable("render_service_client_screen_mode_demo") {
external_deps = [ "hilog:libhilog" ] external_deps = [ "hilog:libhilog" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -87,7 +87,7 @@ ohos_executable("render_service_client_app_demo") {
public_deps = [ "$public_deps_skia" ] public_deps = [ "$public_deps_skia" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -109,7 +109,7 @@ ohos_executable("render_service_client_node_demo") {
public_deps = [ "$public_deps_skia" ] public_deps = [ "$public_deps_skia" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -133,7 +133,7 @@ ohos_executable("render_service_client_modifier_demo") {
external_deps = [ "eventhandler:libeventhandler" ] external_deps = [ "eventhandler:libeventhandler" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -155,7 +155,7 @@ ohos_executable("render_service_client_transition_demo") {
public_deps = [ "$public_deps_skia" ] public_deps = [ "$public_deps_skia" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -180,7 +180,7 @@ ohos_executable("render_service_client_gesture_interrupt_animation_demo") {
external_deps = [ "eventhandler:libeventhandler" ] external_deps = [ "eventhandler:libeventhandler" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -202,7 +202,7 @@ ohos_executable("render_service_client_gravity_demo") {
public_deps = [ "$public_deps_skia" ] public_deps = [ "$public_deps_skia" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -231,7 +231,7 @@ ohos_executable("render_service_client_ui_capture_demo") {
"//third_party/zlib:libz", "//third_party/zlib:libz",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -253,7 +253,7 @@ ohos_executable("render_service_client_scale_demo") {
public_deps = [ "$public_deps_skia" ] public_deps = [ "$public_deps_skia" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -277,7 +277,7 @@ ohos_executable("render_service_client_rs_animation_demo") {
external_deps = [ "eventhandler:libeventhandler" ] external_deps = [ "eventhandler:libeventhandler" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -296,7 +296,7 @@ ohos_executable("surface_capture_demo") {
public_deps = [ "$public_deps_skia" ] public_deps = [ "$public_deps_skia" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -309,7 +309,7 @@ ohos_executable("security_layer_demo") {
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -331,7 +331,7 @@ ohos_executable("render_service_client_surface_node_demo") {
external_deps = [ "hilog:libhilog" ] external_deps = [ "hilog:libhilog" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -353,7 +353,7 @@ ohos_executable("render_service_client_uni_render_demo") {
external_deps = [ "hilog:libhilog" ] external_deps = [ "hilog:libhilog" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -371,7 +371,7 @@ ohos_executable("render_service_client_watermark_demo") {
public_deps = [ "//third_party/flutter/build/skia:ace_skia_ohos" ] public_deps = [ "//third_party/flutter/build/skia:ace_skia_ohos" ]
} }
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -394,7 +394,7 @@ ohos_executable("rs_uni_render_pixelmap_demo") {
public_deps = [ "$public_deps_skia" ] public_deps = [ "$public_deps_skia" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -419,7 +419,7 @@ ohos_executable("render_service_display_mode_demo") {
public_deps = [ "$public_deps_skia" ] public_deps = [ "$public_deps_skia" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
ohos_executable("render_service_client_tunnel_handle_demo") { ohos_executable("render_service_client_tunnel_handle_demo") {
@ -444,7 +444,7 @@ ohos_executable("render_service_client_tunnel_handle_demo") {
"//third_party/zlib:libz", "//third_party/zlib:libz",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -470,7 +470,7 @@ ohos_executable("render_service_client_overlay_demo") {
"//third_party/zlib:libz", "//third_party/zlib:libz",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -492,7 +492,7 @@ ohos_executable("snapshot_surface") {
public_deps = [ "//third_party/libpng:libpng" ] public_deps = [ "//third_party/libpng:libpng" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -512,7 +512,7 @@ ohos_executable("screen_info_demo") {
"./../../../modules/render_service_client:librender_service_client", "./../../../modules/render_service_client:librender_service_client",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -533,7 +533,7 @@ ohos_executable("render_service_client_pointer_window_demo") {
"window_manager:libdm", "window_manager:libdm",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -551,6 +551,6 @@ ohos_executable("render_service_client_fingerprint_demo") {
external_deps = [ "window_manager:libdm" ] external_deps = [ "window_manager:libdm" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
rosen/modules/render_service_client/test/fuzztest/rsanimation_fuzzer/BUILD.gn
View File

@ -16,7 +16,7 @@ import("//build/config/features.gni")
import("//build/test.gni") import("//build/test.gni")
import( import(
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client/render_service_client.gni") "//foundation/graphic/graphic_2d/rosen/modules/render_service_client/render_service_client.gni")
module_output_path = "graphic_standard/render_service_client" module_output_path = "graphic_2d/render_service_client"
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("RSAnimationFuzzTest") { ohos_fuzztest("RSAnimationFuzzTest") {

4
rosen/modules/render_service_client/test/systemtest/BUILD.gn
View File

@ -13,7 +13,7 @@
import("//build/test.gni") import("//build/test.gni")
module_out_path = "graphic_standard/render_service_client" module_out_path = "graphic_2d/render_service_client"
group("systemtest") { group("systemtest") {
testonly = true testonly = true
@ -77,6 +77,6 @@ ohos_static_library("rs_client_test_common") {
external_deps = [ "multimedia_image_framework:image_native" ] external_deps = [ "multimedia_image_framework:image_native" ]
subsystem_name = "graphic" subsystem_name = "graphic"
part_name = "graphic_standard" part_name = "graphic_2d"
} }
## Build rs_client_test_common.a }}} ## Build rs_client_test_common.a }}}

4
rosen/modules/render_service_client/test/unittest/BUILD.gn
View File

@ -13,7 +13,7 @@
import("//build/test.gni") import("//build/test.gni")
module_out_path = "graphic_standard/render_service_client" module_out_path = "graphic_2d/render_service_client"
group("unittest") { group("unittest") {
testonly = true testonly = true
@ -129,6 +129,6 @@ ohos_static_library("rs_client_test_common") {
"//third_party/googletest:gtest_main", "//third_party/googletest:gtest_main",
] ]
subsystem_name = "graphic" subsystem_name = "graphic"
part_name = "graphic_standard" part_name = "graphic_2d"
} }
## Build rs_client_test_common.a }}} ## Build rs_client_test_common.a }}}

2
rosen/modules/render_service_client/test/unittest/animation/BUILD.gn
View File

@ -15,7 +15,7 @@ import("//build/test.gni")
import( import(
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client/render_service_client.gni") "//foundation/graphic/graphic_2d/rosen/modules/render_service_client/render_service_client.gni")
module_output_path = "graphic_standard/rosen/modules/render_service_client" module_output_path = "graphic_2d/rosen/modules/render_service_client"
ohos_unittest("RSAnimationTest") { ohos_unittest("RSAnimationTest") {
module_out_path = module_output_path module_out_path = module_output_path

2
rosen/modules/texgine/BUILD.gn
View File

@ -130,7 +130,7 @@ ohos_shared_library("libtexgine") {
} }
} }
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
## Build libtexgine.so }}} ## Build libtexgine.so }}}

2
rosen/modules/texgine/texgine_drawing/BUILD.gn
View File

@ -66,6 +66,6 @@ ohos_shared_library("libtexgine_drawing") {
deps = [] deps = []
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

10
rosen/samples/2d_graphics/BUILD.gn
View File

@ -41,7 +41,7 @@ ohos_executable("drawing_engine_sample") {
] ]
if (ace_enable_gpu) { if (ace_enable_gpu) {
if (graphic_standard_feature_enable_vulkan) { if (graphic_2d_feature_enable_vulkan) {
sources += [ sources += [
"drawing_engine/drawing_surface/surface_frame_ohos_vulkan.cpp", "drawing_engine/drawing_surface/surface_frame_ohos_vulkan.cpp",
"drawing_engine/drawing_surface/surface_ohos_vulkan.cpp", "drawing_engine/drawing_surface/surface_ohos_vulkan.cpp",
@ -106,7 +106,7 @@ ohos_executable("drawing_engine_sample") {
deps += [ deps += [
#"//third_party/skia:skia", #"//third_party/skia:skia",
] ]
if (graphic_standard_feature_enable_vulkan) { if (graphic_2d_feature_enable_vulkan) {
include_dirs += [ "//third_party/flutter/engine/flutter/vulkan" ] include_dirs += [ "//third_party/flutter/engine/flutter/vulkan" ]
} }
public_deps += [ public_deps += [
@ -124,7 +124,7 @@ ohos_executable("drawing_engine_sample") {
] ]
subsystem_name = "graphic" subsystem_name = "graphic"
part_name = "graphic_standard" part_name = "graphic_2d"
} }
ohos_executable("drawing_sample_rs") { ohos_executable("drawing_sample_rs") {
@ -151,7 +151,7 @@ ohos_executable("drawing_sample_rs") {
external_deps = [ "hilog:libhilog" ] external_deps = [ "hilog:libhilog" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -182,6 +182,6 @@ ohos_executable("drawing_sample_canvaskit0310") {
"ipc:ipc_core", "ipc:ipc_core",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
rosen/samples/2d_graphics/test/BUILD.gn
View File

@ -74,7 +74,7 @@ ohos_executable("drawing_sample") {
"hilog:libhilog", "hilog:libhilog",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
## Build drawing_sample }}} ## Build drawing_sample }}}

2
rosen/samples/composer/BUILD.gn
View File

@ -57,7 +57,7 @@ ohos_executable("hello_composer") {
external_deps = [ "eventhandler:libeventhandler" ] external_deps = [ "eventhandler:libeventhandler" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
rosen/samples/hello_native_buffer/BUILD.gn
View File

@ -45,7 +45,7 @@ ohos_executable("hello_native_buffer") {
external_deps = [ "hilog:libhilog" ] external_deps = [ "hilog:libhilog" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
rosen/samples/hello_native_image/BUILD.gn
View File

@ -56,7 +56,7 @@ ohos_executable("hello_native_image") {
"$graphic_2d_root/frameworks/surfaceimage:libnative_image", "$graphic_2d_root/frameworks/surfaceimage:libnative_image",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

2
rosen/samples/hello_native_window/BUILD.gn
View File

@ -43,7 +43,7 @@ ohos_executable("hello_native_window") {
deps = [ "//foundation/graphic/graphic_2d/frameworks/surface:surface" ] deps = [ "//foundation/graphic/graphic_2d/frameworks/surface:surface" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
## Build hello_native_window }}} ## Build hello_native_window }}}

2
rosen/samples/hello_rosen/BUILD.gn
View File

@ -49,7 +49,7 @@ ohos_executable("hello_rosen") {
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
## Build so }}} ## Build so }}}

2
rosen/samples/hello_vsync/BUILD.gn
View File

@ -40,7 +40,7 @@ ohos_executable("hello_vsync") {
deps = [ "//foundation/graphic/graphic_2d/rosen/modules/composer/native_vsync:libnative_vsync" ] deps = [ "//foundation/graphic/graphic_2d/rosen/modules/composer/native_vsync:libnative_vsync" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

52
rosen/samples/texgine/BUILD.gn
View File

@ -77,7 +77,7 @@ ohos_shared_library("libskia_rs_framework") {
"input:libmmi-client", "input:libmmi-client",
] ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -94,7 +94,7 @@ ohos_source_set("texgine_sample") {
external_deps = [ "hitrace:hitrace_meter" ] external_deps = [ "hitrace:hitrace_meter" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -102,7 +102,7 @@ ohos_executable("texgine_sample_align") {
install_enable = true install_enable = true
sources = [ "feature_test/align_test.cpp" ] sources = [ "feature_test/align_test.cpp" ]
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -113,7 +113,7 @@ ohos_executable("texgine_sample_alignment") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -124,7 +124,7 @@ ohos_executable("texgine_sample_calibrate") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -135,7 +135,7 @@ ohos_executable("texgine_sample_decoration") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -147,7 +147,7 @@ ohos_executable("texgine_sample_direction") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -158,7 +158,7 @@ ohos_executable("texgine_sample_mix") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -169,7 +169,7 @@ ohos_executable("texgine_sample_shadow") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -183,7 +183,7 @@ ohos_executable("texgine_sample_bug") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -195,7 +195,7 @@ ohos_executable("texgine_sample_dynamic_font") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -207,7 +207,7 @@ ohos_executable("texgine_sample_emoji") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -218,7 +218,7 @@ ohos_executable("texgine_sample_font_style") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -229,7 +229,7 @@ ohos_executable("texgine_sample_feature") {
defines = [ "RESOURCE_PATH_PREFIX=\"/system/etc/test_resources/\"" ] defines = [ "RESOURCE_PATH_PREFIX=\"/system/etc/test_resources/\"" ]
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -240,7 +240,7 @@ ohos_executable("texgine_sample_glyph_position") {
defines = [ "RESOURCE_PATH_PREFIX=\"/system/etc/test_resources/\"" ] defines = [ "RESOURCE_PATH_PREFIX=\"/system/etc/test_resources/\"" ]
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -250,7 +250,7 @@ ohos_executable("texgine_sample_intrinsic_width") {
sources = [ "feature_test/intrinsic_width_test.cpp" ] sources = [ "feature_test/intrinsic_width_test.cpp" ]
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -261,7 +261,7 @@ ohos_executable("texgine_sample_spacing") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -271,7 +271,7 @@ ohos_executable("texgine_sample_strut") {
sources = [ "feature_test/strut_test.cpp" ] sources = [ "feature_test/strut_test.cpp" ]
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -281,7 +281,7 @@ ohos_executable("texgine_sample_text_color") {
sources = [ "feature_test/text_color_test.cpp" ] sources = [ "feature_test/text_color_test.cpp" ]
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -292,7 +292,7 @@ ohos_executable("texgine_sample_weight_style") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -303,7 +303,7 @@ ohos_executable("texgine_sample_word_boundary") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -314,7 +314,7 @@ ohos_executable("texgine_sample_ellipsis") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -325,7 +325,7 @@ ohos_executable("texgine_sample_layout") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -337,7 +337,7 @@ ohos_executable("texgine_sample_dynamic_otf_font") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -348,7 +348,7 @@ ohos_executable("texgine_sample_text_height") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }
@ -359,6 +359,6 @@ ohos_executable("texgine_sample_typography_height") {
deps = [ ":texgine_sample" ] deps = [ ":texgine_sample" ]
part_name = "graphic_standard" part_name = "graphic_2d"
subsystem_name = "graphic" subsystem_name = "graphic"
} }

Some files were not shown because too many files have changed in this diff Show More