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

Description:change dir graphic/graphic to graphic/graphic_2d

Browse Source 
IssueNo:https://gitee.com/openharmony/graphic_standard/issues/I57W1P
Feature or Bugfix: Bugfix
Binary Source:NA

Signed-off-by: sufeng <sufeng6@huawei.com>
This commit is contained in:
sufeng 2022-05-18 21:14:57 +08:00
parent 8143106ab4
commit e9c960e55e
88 changed files with 515 additions and 497 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.gn
View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/utils/wmlayout/wmlayout.gni")
import("//foundation/graphic/graphic_2d/utils/wmlayout/wmlayout.gni")
import("graphic_config.gni")
group("default") {

2
README_zh.md
View File

@ -30,7 +30,7 @@ OpenHarmony 图形栈的分层说明如下：
## 目录
```
foundation/graphic/graphic/
foundation/graphic/graphic_2d/
├── figures # Markdown引用的图片目录
├── frameworks # 框架代码目录
│ ├── animation_server # AnimationServer代码

76
bundle.json
View File

@ -5,7 +5,7 @@
"license": "Apache License 2.0",
"publishAs": "code-segment",
"segment": {
"destPath": "foundation/graphic/graphic"
"destPath": "foundation/graphic/graphic_2d"
},
"dirs": {},
"scripts": {},
@ -28,7 +28,7 @@
"rom": "10000KB",
"ram": "10000KB",
"hisysevent_config": [
"//foundation/graphic/graphic/hisysevent.yaml"
"//foundation/graphic/graphic_2d/hisysevent.yaml"
],
"deps": {
"components": [
@ -55,28 +55,28 @@
"//third_party/wayland-ivi-extension:LayerManagerControl",
"//third_party/wayland-ivi-extension:simple-weston-client",
"//third_party/weston:default",
"//foundation/graphic/graphic:default",
"//foundation/graphic/graphic/interfaces/kits/napi:napi_packages",
"//foundation/graphic/graphic/rosen/samples/composer:hello_composer",
"//foundation/graphic/graphic/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic/rosen/samples/2d_graphics:drawing_sample_rs",
"//foundation/graphic/graphic/rosen/samples/2d_graphics:drawing_engine_sample",
"//foundation/graphic/graphic/rosen/samples/2d_graphics/test:drawing_sample",
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic/rosen/modules/render_service_base/test:render_service_client",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic/rosen/modules/render_service_client/test:render_service_client_rs_demo",
"//foundation/graphic/graphic/rosen/modules/render_service:librender_service",
"//foundation/graphic/graphic/rosen/modules/render_service:render_service",
"//foundation/graphic/graphic/rosen/modules/render_service:render_service_dump",
"//foundation/graphic/graphic/rosen/modules/effect/effectChain:libeffectchain",
"//foundation/graphic/graphic/rosen/modules/effect/egl:libegl_effect"
"//foundation/graphic/graphic_2d:default",
"//foundation/graphic/graphic_2d/interfaces/kits/napi:napi_packages",
"//foundation/graphic/graphic_2d/rosen/samples/composer:hello_composer",
"//foundation/graphic/graphic_2d/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/samples/2d_graphics:drawing_sample_rs",
"//foundation/graphic/graphic_2d/rosen/samples/2d_graphics:drawing_engine_sample",
"//foundation/graphic/graphic_2d/rosen/samples/2d_graphics/test:drawing_sample",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/test:render_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client/test:render_service_client_rs_demo",
"//foundation/graphic/graphic_2d/rosen/modules/render_service:librender_service",
"//foundation/graphic/graphic_2d/rosen/modules/render_service:render_service",
"//foundation/graphic/graphic_2d/rosen/modules/render_service:render_service_dump",
"//foundation/graphic/graphic_2d/rosen/modules/effect/effectChain:libeffectchain",
"//foundation/graphic/graphic_2d/rosen/modules/effect/egl:libegl_effect"
],
"inner_kits": [
{
"type": "so",
"name": "//foundation/graphic/graphic/frameworks/surface:surface",
"name": "//foundation/graphic/graphic_2d/frameworks/surface:surface",
"header": {
"header_files": [
"buffer_extra_data.h",
@ -91,54 +91,54 @@
"surface_utils.h",
"window.h"
],
"header_base": "//foundation/graphic/graphic/interfaces/inner_api/surface"
"header_base": "//foundation/graphic/graphic_2d/interfaces/inner_api/surface"
}
},
{
"type": "so",
"name": "//foundation/graphic/graphic/frameworks/vsync:libvsync_client",
"name": "//foundation/graphic/graphic_2d/frameworks/vsync:libvsync_client",
"header": {
"header_files": [
"vsync_helper.h"
],
"header_base": "//foundation/graphic/graphic/interfaces/inner_api/vsync"
"header_base": "//foundation/graphic/graphic_2d/interfaces/inner_api/vsync"
}
},
{
"type": "so",
"name": "//foundation/graphic/graphic/rosen/modules/composer:libcomposer",
"name": "//foundation/graphic/graphic_2d/rosen/modules/composer:libcomposer",
"header": {
"header_files": [
"vsync_receiver.h"
],
"header_base": "//foundation/graphic/graphic/interfaces/inner_api/composer"
"header_base": "//foundation/graphic/graphic_2d/interfaces/inner_api/composer"
}
},
{
"type": "so",
"name": "//foundation/graphic/graphic/frameworks/vsync:libvsync_module",
"name": "//foundation/graphic/graphic_2d/frameworks/vsync:libvsync_module",
"header": {
"header_files": [
"vsync_module.h",
"vsync_module_c.h"
],
"header_base": "//foundation/graphic/graphic/interfaces/inner_api/vsync_module"
"header_base": "//foundation/graphic/graphic_2d/interfaces/inner_api/vsync_module"
}
},
{
"type": "so",
"name": "//foundation/graphic/graphic/utils:libgraphic_utils",
"name": "//foundation/graphic/graphic_2d/utils:libgraphic_utils",
"header": {
"header_files": [
"graphic_common.h",
"graphic_common_c.h"
],
"header_base": "//foundation/graphic/graphic/interfaces/inner_api/common"
"header_base": "//foundation/graphic/graphic_2d/interfaces/inner_api/common"
}
},
{
"type": "so",
"name": "//foundation/graphic/graphic/frameworks/wm:libwmclient",
"name": "//foundation/graphic/graphic_2d/frameworks/wm:libwmclient",
"header": {
"header_files": [
"iscreen_shot_callback.h",
@ -152,12 +152,12 @@
"window_option.h",
"wm_common.h"
],
"header_base": "//foundation/graphic/graphic/interfaces/inner_api/wmclient"
"header_base": "//foundation/graphic/graphic_2d/interfaces/inner_api/wmclient"
}
},
{
"type": "so",
"name": "//foundation/graphic/graphic/frameworks/wmservice:libwmservice",
"name": "//foundation/graphic/graphic_2d/frameworks/wmservice:libwmservice",
"header": {
"header_files": [
"iwindow_change_listener_clazz.h",
@ -166,12 +166,12 @@
"window_manager_service_client.h",
"window_manager_service_type.h"
],
"header_base": "//foundation/graphic/graphic/interfaces/inner_api/wmservice"
"header_base": "//foundation/graphic/graphic_2d/interfaces/inner_api/wmservice"
}
},
{
"type": "so",
"name": "//foundation/graphic/graphic/rosen/modules/animation/window_animation:window_animation",
"name": "//foundation/graphic/graphic_2d/rosen/modules/animation/window_animation:window_animation",
"header": {
"header_files": [
"rs_iwindow_animation_controller.h",
@ -181,14 +181,14 @@
"rs_window_animation_stub.h",
"rs_window_animation_target.h"
],
"header_base": "//foundation/graphic/graphic/rosen/modules/animation/window_animation/include"
"header_base": "//foundation/graphic/graphic_2d/rosen/modules/animation/window_animation/include"
}
}
],
"test": [
"//foundation/graphic/graphic:graphic_standard_test",
"//foundation/graphic/graphic/rosen/test/render_service:unittest",
"//foundation/graphic/graphic/rosen/test/2d_graphics:test"
"//foundation/graphic/graphic_2d:graphic_standard_test",
"//foundation/graphic/graphic_2d/rosen/test/render_service:unittest",
"//foundation/graphic/graphic_2d/rosen/test/2d_graphics:test"
]
}
}

2
flutter.gni
View File

@ -13,7 +13,7 @@
ace_flutter_gn_root =
"//foundation/arkui/ace_engine/build/external_config/flutter"
rosen_flutter_gn_root = "//foundation/graphic/graphic/rosen/build/flutter"
rosen_flutter_gn_root = "//foundation/graphic/graphic_2d/rosen/build/flutter"
ace_root = "//foundation/arkui/ace_engine"
ace_flutter_engine_root = "$ace_root/build/external_config/flutter"

14
frameworks/animation_server/BUILD.gn
View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
## Build libanimation_service.so {{{
config("libanimation_service_config") {
@ -33,7 +33,7 @@ config("libanimation_service_config") {
config("libanimation_service_public_config") {
include_dirs = [
"export",
"//foundation/graphic/graphic/interfaces/inner_api/common",
"//foundation/graphic/graphic_2d/interfaces/inner_api/common",
]
}
@ -49,7 +49,7 @@ ohos_shared_library("libanimation_service") {
deps = [
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/graphic/utils:libgraphic_utils",
"//foundation/graphic/graphic_2d/utils:libgraphic_utils",
]
public_deps = [
@ -110,10 +110,10 @@ ohos_executable("animation_server") {
deps = [
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/graphic:libvsync_client",
"//foundation/graphic/graphic:libwmclient",
"//foundation/graphic/graphic:libwmservice",
"//foundation/graphic/graphic/utils:libgraphic_utils",
"//foundation/graphic/graphic_2d:libvsync_client",
"//foundation/graphic/graphic_2d:libwmclient",
"//foundation/graphic/graphic_2d:libwmservice",
"//foundation/graphic/graphic_2d/utils:libgraphic_utils",
]
part_name = "graphic_standard"

18
frameworks/bootanimation/BUILD.gn
View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
## Build bootanimation {{{
config("bootanimation_config") {
@ -20,7 +20,7 @@ config("bootanimation_config") {
include_dirs = [
"include",
"//foundation/graphic/graphic/utils/log",
"//foundation/graphic/graphic_2d/utils/log",
"//third_party/cJSON",
"//foundation/multimedia/media_standard/interfaces/inner_api/native",
]
@ -53,13 +53,13 @@ ohos_executable("bootanimation") {
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic:libvsync_client",
"//foundation/graphic/graphic:libwmclient",
"//foundation/graphic/graphic:libwmservice",
"//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic/rosen/modules/render_service_base/src/platform:platform",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d:libvsync_client",
"//foundation/graphic/graphic_2d:libwmclient",
"//foundation/graphic/graphic_2d:libwmservice",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/src/platform:platform",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/multimedia/media_standard/interfaces/inner_api/native:media_client",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/dmserver:libdms",

6
frameworks/dumper/BUILD.gn
View File

@ -42,7 +42,7 @@ ohos_shared_library("libgraphic_dumper_client") {
public_configs = [ ":graphic_dumper_client_public_config" ]
deps = [ "//foundation/graphic/graphic/utils:libgraphic_utils" ]
deps = [ "//foundation/graphic/graphic_2d/utils:libgraphic_utils" ]
external_deps = [
"hilog_native:libhilog",
@ -94,7 +94,7 @@ ohos_executable("graphic_dumper_server") {
]
deps = [
"//foundation/graphic/graphic/utils:libgraphic_utils",
"//foundation/graphic/graphic_2d/utils:libgraphic_utils",
"//third_party/zlib:libz",
]
@ -149,7 +149,7 @@ ohos_executable("gdumper") {
]
deps = [
"//foundation/graphic/graphic/utils:libgraphic_utils",
"//foundation/graphic/graphic_2d/utils:libgraphic_utils",
"//third_party/zlib:libz",
]

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

@ -52,9 +52,9 @@ ohos_static_library("fence_test_common") {
public_configs = [ ":fence_test_common_public_config" ]
public_deps = [
"//foundation/graphic/graphic:libfence",
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic/utils:libgraphic_utils",
"//foundation/graphic/graphic_2d:libfence",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d/utils:libgraphic_utils",
]
subsystem_name = "graphic"
part_name = "graphic_standard"

14
frameworks/surface/BUILD.gn
View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
## Build surface.so {{{
config("surface_config") {
@ -29,8 +29,8 @@ config("surface_config") {
config("surface_public_config") {
include_dirs = [
"//foundation/graphic/graphic/interfaces/inner_api/surface",
"//foundation/graphic/graphic/interfaces/inner_api/common",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/interfaces/inner_api/common",
]
if (ace_enable_gpu) {
@ -88,10 +88,10 @@ ohos_shared_library("surface") {
"//drivers/peripheral/display/hal:hdi_display_gralloc",
"//drivers/peripheral/display/hdi_service/gralloc/client:hdi_gralloc_client",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/graphic/graphic/utils/buffer_handle:buffer_handle",
"//foundation/graphic/graphic/utils/gslogger:libgslogger",
"//foundation/graphic/graphic/utils/scoped_bytrace:scoped_bytrace",
"//foundation/graphic/graphic/utils/sync_fence:sync_fence",
"//foundation/graphic/graphic_2d/utils/buffer_handle:buffer_handle",
"//foundation/graphic/graphic_2d/utils/gslogger:libgslogger",
"//foundation/graphic/graphic_2d/utils/scoped_bytrace:scoped_bytrace",
"//foundation/graphic/graphic_2d/utils/sync_fence:sync_fence",
"//third_party/EGL:libEGL",
"//third_party/openGLES:libGLES",
"//utils/native/base:utils",

14
frameworks/surface/bundle.json
View File

@ -5,7 +5,7 @@
"license": "Apache License 2.0",
"publishAs": "code-segment",
"segment": {
"destPath": "foundation/graphic/graphic"
"destPath": "foundation/graphic/graphic_2d"
},
"dirs": {},
"scripts": {},
@ -32,13 +32,13 @@
},
"build": {
"sub_component": [
"//foundation/graphic/graphic/frameworks/surface:surface",
"//foundation/graphic/graphic/utils/buffer_handle:buffer_handle"
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//foundation/graphic/graphic_2d/utils/buffer_handle:buffer_handle"
],
"inner_kits": [
{
"type": "so",
"name": "//foundation/graphic/graphic/frameworks/surface:surface",
"name": "//foundation/graphic/graphic_2d/frameworks/surface:surface",
"header": {
"header_files": [
"buffer_extra_data.h",
@ -53,18 +53,18 @@
"surface_utils.h",
"window.h"
],
"header_base": "//foundation/graphic/graphic/interfaces/inner_api/surface"
"header_base": "//foundation/graphic/graphic_2d/interfaces/inner_api/surface"
}
},
{
"type": "so",
"name": "//foundation/graphic/graphic/utils/buffer_handle:buffer_handle",
"name": "//foundation/graphic/graphic_2d/utils/buffer_handle:buffer_handle",
"header": {
"header_files": [
"buffer_handle_parcel.h",
"buffer_handle_utils.h"
],
"header_base": "//foundation/graphic/graphic/utils/buffer_handle/export"
"header_base": "//foundation/graphic/graphic_2d/utils/buffer_handle/export"
}
}
]

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

@ -31,7 +31,7 @@ ohos_systemtest("native_window_buffer_test") {
sources = [ "native_window_buffer_test.cpp" ]
include_dirs = [
"//foundation/graphic/graphic/frameworks/surface/include",
"//foundation/graphic/graphic_2d/frameworks/surface/include",
"//drivers/peripheral/display/interfaces/include",
]
@ -46,8 +46,8 @@ ohos_systemtest("native_window_buffer_test") {
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic/utils:libgraphic_utils",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d/utils:libgraphic_utils",
"//third_party/googletest:gtest_main",
]
}
@ -61,7 +61,7 @@ ohos_systemtest("surface_ipc_test") {
sources = [ "surface_ipc_test.cpp" ]
include_dirs = [
"//foundation/graphic/graphic/frameworks/surface/include",
"//foundation/graphic/graphic_2d/frameworks/surface/include",
"//drivers/peripheral/display/interfaces/include",
]
@ -73,7 +73,7 @@ ohos_systemtest("surface_ipc_test") {
deps = [
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic_2d:libsurface",
"//third_party/googletest:gtest_main",
]
}

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

@ -169,7 +169,7 @@ ohos_unittest("native_window_test") {
## Build surface_test_common.a {{{
config("surface_test_common_public_config") {
include_dirs = [
"//foundation/graphic/graphic/frameworks/surface/include",
"//foundation/graphic/graphic_2d/frameworks/surface/include",
"//drivers/peripheral/display/interfaces/include",
]
@ -191,9 +191,9 @@ ohos_static_library("surface_test_common") {
public_deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic/utils:buffer_handle",
"//foundation/graphic/graphic/utils:libgraphic_utils",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d/utils:buffer_handle",
"//foundation/graphic/graphic_2d/utils:libgraphic_utils",
"//third_party/googletest:gtest_main",
]
subsystem_name = "graphic"

10
frameworks/surfaceimage/BUILD.gn
View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
## Build libsurfaceimage.so {{{
config("surfaceimage_config") {
@ -27,7 +27,7 @@ config("surfaceimage_config") {
config("libsurfaceimage_public_config") {
include_dirs = [
"//foundation/graphic/graphic/frameworks/surface/include",
"//foundation/graphic/graphic_2d/frameworks/surface/include",
"include",
]
}
@ -39,11 +39,11 @@ ohos_shared_library("libsurfaceimage") {
public_configs = [ ":libsurfaceimage_public_config" ]
deps = [ "//foundation/graphic/graphic/frameworks/surface:surface" ]
deps = [ "//foundation/graphic/graphic_2d/frameworks/surface:surface" ]
public_deps = [
"//foundation/graphic/graphic:libgl",
"//foundation/graphic/graphic/utils:sync_fence",
"//foundation/graphic/graphic_2d:libgl",
"//foundation/graphic/graphic_2d/utils:sync_fence",
]
external_deps = [

14
frameworks/vsync/BUILD.gn
View File

@ -31,7 +31,7 @@ config("libvsync_client_config") {
config("libvsync_client_public_config") {
include_dirs = [
"//foundation/graphic/graphic/interfaces/inner_api/vsync",
"//foundation/graphic/graphic_2d/interfaces/inner_api/vsync",
"//utils/native/base/include",
]
}
@ -53,14 +53,14 @@ ohos_shared_library("libvsync_client") {
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/graphic/utils:libgraphic_utils",
"//foundation/graphic/graphic_2d/utils:libgraphic_utils",
]
external_deps = [ "ipc:ipc_core" ]
public_deps = [
"//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler",
"//foundation/graphic/graphic:libgraphic_dumper_client",
"//foundation/graphic/graphic_2d:libgraphic_dumper_client",
"//utils/native/base:utils",
]
@ -88,8 +88,8 @@ config("libvsync_module_config") {
config("libvsync_module_public_config") {
include_dirs = [
"//foundation/graphic/graphic/interfaces/inner_api/common",
"//foundation/graphic/graphic/interfaces/inner_api/vsync_module",
"//foundation/graphic/graphic_2d/interfaces/inner_api/common",
"//foundation/graphic/graphic_2d/interfaces/inner_api/vsync_module",
]
}
@ -113,12 +113,12 @@ ohos_shared_library("libvsync_module") {
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/graphic/utils:libgraphic_utils",
"//foundation/graphic/graphic_2d/utils:libgraphic_utils",
"//third_party/libdrm:libdrm",
]
public_deps = [
"//foundation/graphic/graphic/utils:semaphore",
"//foundation/graphic/graphic_2d/utils:semaphore",
"//utils/native/base:utils",
]

28
frameworks/wm/BUILD.gn
View File

@ -32,9 +32,9 @@ config("wms_client_config") {
config("wms_client_public_config") {
include_dirs = [
"//foundation/graphic/graphic/interfaces/inner_api",
"//foundation/graphic/graphic/interfaces/inner_api/wm",
"//foundation/graphic/graphic/interfaces/inner_api/common",
"//foundation/graphic/graphic_2d/interfaces/inner_api",
"//foundation/graphic/graphic_2d/interfaces/inner_api/wm",
"//foundation/graphic/graphic_2d/interfaces/inner_api/common",
]
}
@ -70,8 +70,8 @@ ohos_shared_library("wms_client") {
]
deps = [
"//foundation/graphic/graphic:libwmservice",
"//foundation/graphic/graphic/frameworks/wmserver:wms_protocol",
"//foundation/graphic/graphic_2d:libwmservice",
"//foundation/graphic/graphic_2d/frameworks/wmserver:wms_protocol",
"//third_party/wayland-protocols_standard:linux_dmabuf_unstable_v1_protocol",
"//third_party/wayland-protocols_standard:linux_explicit_synchronization_unstable_v1_protocol",
"//third_party/wayland-protocols_standard:viewporter_protocol",
@ -101,7 +101,7 @@ ohos_shared_library("wms_client") {
"samgr_standard:samgr_proxy",
]
public_deps = [ "//foundation/graphic/graphic:libsurface" ]
public_deps = [ "//foundation/graphic/graphic_2d:libsurface" ]
part_name = "graphic_standard"
subsystem_name = "graphic"
@ -128,7 +128,7 @@ config("libwmclient_config") {
config("libwmclient_public_config") {
include_dirs =
[ "//foundation/graphic/graphic/interfaces/inner_api/wmclient" ]
[ "//foundation/graphic/graphic_2d/interfaces/inner_api/wmclient" ]
}
ohos_shared_library("libwmclient") {
@ -171,11 +171,11 @@ ohos_shared_library("libwmclient") {
public_configs = [ ":libwmclient_public_config" ]
deps = [
"//foundation/graphic/graphic:libfence",
"//foundation/graphic/graphic:libgraphic_dumper_client",
"//foundation/graphic/graphic:libwmservice",
"//foundation/graphic/graphic/frameworks/wmserver:wms_protocol",
"//foundation/graphic/graphic/utils:libgraphic_utils",
"//foundation/graphic/graphic_2d:libfence",
"//foundation/graphic/graphic_2d:libgraphic_dumper_client",
"//foundation/graphic/graphic_2d:libwmservice",
"//foundation/graphic/graphic_2d/frameworks/wmserver:wms_protocol",
"//foundation/graphic/graphic_2d/utils:libgraphic_utils",
"//third_party/wayland-protocols_standard:linux_dmabuf_unstable_v1_protocol",
"//third_party/wayland-protocols_standard:linux_explicit_synchronization_unstable_v1_protocol",
"//third_party/wayland-protocols_standard:viewporter_protocol",
@ -206,8 +206,8 @@ ohos_shared_library("libwmclient") {
]
public_deps = [
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic/utils:promise",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d/utils:promise",
]
part_name = "graphic_standard"

8
frameworks/wmserver/BUILD.gn
View File

@ -32,8 +32,8 @@ config("wmserver_config") {
"//third_party/weston/libweston",
"//third_party/wayland-ivi-extension/ivi-input-modules/ivi-input-controller/src/",
"//utils/native/base/include",
"//foundation/graphic/graphic/interfaces/inner_api/wmclient",
"//foundation/graphic/graphic/interfaces/inner_api/wmservice",
"//foundation/graphic/graphic_2d/interfaces/inner_api/wmclient",
"//foundation/graphic/graphic_2d/interfaces/inner_api/wmservice",
]
cflags = [
@ -63,8 +63,8 @@ ohos_shared_library("wmserver") {
deps = [
":layout_header",
"//drivers/peripheral/display/hal:hdi_display_device",
"//foundation/graphic/graphic/frameworks/animation_server:libanimation_service",
"//foundation/graphic/graphic/utils:libgraphic_utils",
"//foundation/graphic/graphic_2d/frameworks/animation_server:libanimation_service",
"//foundation/graphic/graphic_2d/utils:libgraphic_utils",
"//third_party/wayland_standard:wayland_core_protocol",
"//third_party/weston:libexec_weston",
"//third_party/weston:trace",

4
frameworks/wmserver/src/wmlayout_scss_parser/BUILD.gn
View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/utils/lex_yacc/lex_yacc.gni")
import("//foundation/graphic/graphic_2d/utils/lex_yacc/lex_yacc.gni")
## Build wmlayout_scss_parser {{{
lex_yacc("wmlayout_scss_parser_parser") {
@ -24,7 +24,7 @@ config("wmlayout_scss_parser_config") {
visibility = [ ":*" ]
include_dirs =
[ "//foundation/graphic/graphic/interfaces/inner_api/wmclient" ]
[ "//foundation/graphic/graphic_2d/interfaces/inner_api/wmclient" ]
cflags = [
"-Wall",

12
frameworks/wmservice/BUILD.gn
View File

@ -31,9 +31,9 @@ config("libwmservice_config") {
config("libwmservice_public_config") {
include_dirs = [
"//foundation/graphic/graphic/interfaces/inner_api/common",
"//foundation/graphic/graphic/interfaces/inner_api/wmclient",
"//foundation/graphic/graphic/interfaces/inner_api/wmservice",
"//foundation/graphic/graphic_2d/interfaces/inner_api/common",
"//foundation/graphic/graphic_2d/interfaces/inner_api/wmclient",
"//foundation/graphic/graphic_2d/interfaces/inner_api/wmservice",
"//drivers/peripheral/base",
"//drivers/peripheral/display/interfaces/include",
"//third_party/bounds_checking_function/include",
@ -54,14 +54,14 @@ ohos_shared_library("libwmservice") {
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/graphic/frameworks/animation_server:libanimation_service",
"//foundation/graphic/graphic/frameworks/wmserver:wms_protocol",
"//foundation/graphic/graphic_2d/frameworks/animation_server:libanimation_service",
"//foundation/graphic/graphic_2d/frameworks/wmserver:wms_protocol",
"//third_party/wayland_standard:libwayland_client",
]
public_deps = [
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/graphic/graphic/utils:promise",
"//foundation/graphic/graphic_2d/utils:promise",
"//utils/native/base:utils",
]

14
frameworks/wmtest/BUILD.gn
View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
## Build wmtest {{{
config("wmtest_config") {
@ -100,12 +100,12 @@ ohos_systemtest("wmtest") {
deps = [
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/graphic:libgraphic_dumper_client",
"//foundation/graphic/graphic:libvsync_client",
"//foundation/graphic/graphic:libwmclient",
"//foundation/graphic/graphic:libwmservice",
"//foundation/graphic/graphic/frameworks/animation_server:libanimation_service",
"//foundation/graphic/graphic/utils:libgraphic_utils",
"//foundation/graphic/graphic_2d:libgraphic_dumper_client",
"//foundation/graphic/graphic_2d:libvsync_client",
"//foundation/graphic/graphic_2d:libwmclient",
"//foundation/graphic/graphic_2d:libwmservice",
"//foundation/graphic/graphic_2d/frameworks/animation_server:libanimation_service",
"//foundation/graphic/graphic_2d/utils:libgraphic_utils",
"//third_party/zlib:libz",
]

4
graphic_config.gni
View File

@ -27,8 +27,8 @@ if (graphic_standard_feature_ace_enable_gpu) {
# libgl is a native stub for decoupling system.img and vendor.img
# real libgl installed in /vendor/lib/chipsetsdk
libgl = [
"//foundation/graphic/graphic/frameworks/opengl/libs/EGL:libEGL_stub",
"//foundation/graphic/graphic/frameworks/opengl/libs/GLES3:libGLESv3_stub",
"//foundation/graphic/graphic_2d/frameworks/opengl/libs/EGL:libEGL_stub",
"//foundation/graphic/graphic_2d/frameworks/opengl/libs/GLES3:libGLESv3_stub",
]
} else {
gpu_defines = [ "ACE_DISABLE_GL" ]

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

@ -31,7 +31,7 @@ ohos_shared_library("windowanimationmanager_napi") {
cflags_cc = [ "-std=c++17" ]
deps = [
"//foundation/graphic/graphic/rosen/modules/animation/window_animation:window_animation",
"//foundation/graphic/graphic_2d/rosen/modules/animation/window_animation:window_animation",
"//foundation/windowmanager/utils:libwmutil",
]

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

@ -21,7 +21,7 @@ ohos_shared_library("display") {
"../common:graphic_napi_common",
# "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/graphic/graphic:libwmservice",
"//foundation/graphic/graphic_2d:libwmservice",
]
relative_install_dir = "module"

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

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
config("render_config") {
cflags = []
@ -22,7 +22,7 @@ config("render_config") {
ohos_source_set("webgl_src") {
include_dirs = [
"//foundation/graphic/graphic/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
"src",
"//third_party/node/src",
"//utils/native/base/include",
@ -38,7 +38,7 @@ ohos_source_set("webgl_src") {
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/arkui/napi:ace_napi",
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic_2d:libsurface",
"//third_party/bounds_checking_function:libsec_static",
"//third_party/libuv:uv_static",
"//utils/native/base:utils",
@ -77,7 +77,7 @@ ohos_source_set("webgl_src") {
"src/webgl/src/webgl_vertex_array_object.cpp",
]
deps += [ "//foundation/graphic/graphic:libgl" ]
deps += [ "//foundation/graphic/graphic_2d:libgl" ]
}
cflags = [

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

@ -29,8 +29,8 @@ ohos_shared_library("window") {
"${aakits_path}/ability/native:abilitykit_native",
"${aakits_path}/appkit:appkit_native",
"../common:graphic_napi_common",
"//foundation/graphic/graphic:libwmclient",
"//foundation/graphic/graphic:libwmservice",
"//foundation/graphic/graphic_2d:libwmclient",
"//foundation/graphic/graphic_2d:libwmservice",
]
relative_install_dir = "module"

20
interfaces/kits/ndk/native_drawing/BUILD.gn
View File

@ -17,16 +17,16 @@ import("//build/ohos/ndk/ndk.gni")
ohos_ndk_headers("native_drawing_header") {
dest_dir = "$ndk_headers_out_dir/native_drawing"
sources = [
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include/c/drawing_bitmap.h",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include/c/drawing_brush.h",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include/c/drawing_canvas.h",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include/c/drawing_color.h",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include/c/drawing_font_collection.h",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include/c/drawing_path.h",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include/c/drawing_pen.h",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include/c/drawing_text_declaration.h",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include/c/drawing_text_typography.h",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include/c/drawing_types.h",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include/c/drawing_bitmap.h",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include/c/drawing_brush.h",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include/c/drawing_canvas.h",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include/c/drawing_color.h",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include/c/drawing_font_collection.h",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include/c/drawing_path.h",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include/c/drawing_pen.h",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include/c/drawing_text_declaration.h",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include/c/drawing_text_typography.h",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include/c/drawing_types.h",
]
}

4
interfaces/kits/ndk/native_window/BUILD.gn
View File

@ -18,8 +18,8 @@ ohos_ndk_headers("native_window_header") {
dest_dir = "$ndk_headers_out_dir/native_window"
sources = [
"//drivers/peripheral/base/buffer_handle.h",
"//foundation/graphic/graphic/interfaces/inner_api/surface/external_window.h",
"//foundation/graphic/graphic/interfaces/inner_api/surface/window.h",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface/external_window.h",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface/window.h",
]
}

6
rosen/build/flutter/BUILD.gn
View File

@ -436,11 +436,11 @@ template("flutter_engine_shell") {
"$flutter_root/engine/flutter/shell/platform/ohos/ohos_surface_gl.cc",
]
public_deps = [ "//foundation/graphic/graphic:libgl" ]
public_deps = [ "//foundation/graphic/graphic_2d:libgl" ]
}
deps += [
"//foundation/graphic/graphic:libvsync_client",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d:libvsync_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/wm:libwm",
]
external_deps = [

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

@ -118,7 +118,7 @@ template("rosen_libharfbuzz") {
"$flutter_root/skia/third_party/externals/harfbuzz/src/hb-warning.cc",
]
deps = [ "//foundation/graphic/graphic/rosen/build/flutter/icu:rosen_libicu_$platform" ]
deps = [ "//foundation/graphic/graphic_2d/rosen/build/flutter/icu:rosen_libicu_$platform" ]
}
}

9
rosen/build/skia/BUILD.gn
View File

@ -13,9 +13,10 @@
import("//build/ohos.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
rosen_flutter_engine_root = "//foundation/graphic/graphic/rosen/build/flutter"
rosen_flutter_engine_root =
"//foundation/graphic/graphic_2d/rosen/build/flutter"
# ------------------------------------------------
# Skia shared library
@ -606,7 +607,7 @@ ohos_source_set("rosen_skia_core_ohos") {
]
} else {
if (is_standard_system) {
public_deps = [ "//foundation/graphic/graphic:libgl" ]
public_deps = [ "//foundation/graphic/graphic_2d:libgl" ]
} else {
aosp_deps = [
"shared_library:libEGL",
@ -949,7 +950,7 @@ ohos_source_set("rosen_gpu_ohos") {
if (ace_enable_gpu) {
# Ohos or Android platform
if (is_standard_system) {
public_deps = [ "//foundation/graphic/graphic:libgl" ]
public_deps = [ "//foundation/graphic/graphic_2d:libgl" ]
} else {
aosp_deps = [
"shared_library:libEGL",

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

@ -13,7 +13,7 @@
import("//build/ohos.gni")
import(
"//foundation/graphic/graphic/rosen/modules/2d_engine/rosen_text/config.gni")
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/config.gni")
## Build librosen_text.so
config("rosen_text_config") {

2
rosen/modules/2d_engine/rosen_text/config.gni
View File

@ -14,7 +14,7 @@
import("//build/ohos.gni")
# Config path
rosen_root = "//foundation/graphic/graphic/rosen"
rosen_root = "//foundation/graphic/graphic_2d/rosen"
rosen_2d_engine_root = "$rosen_root/modules/2d_engine"
rosen_2d_engine_root_ui = "$rosen_2d_engine_root/ui"
rosen_text_root = "$rosen_2d_engine_root/rosen_text"

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

@ -14,7 +14,7 @@
import("//build/ohos.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/graphic/graphic/rosen/modules/2d_engine/rosen_text/config.gni")
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/config.gni")
config("rosen_text_config") {
cflags_cc = [

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

@ -14,7 +14,7 @@
import("//build/ohos.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/graphic/graphic/rosen/modules/2d_engine/rosen_text/config.gni")
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/config.gni")
config("rosen_text_ui_config") {
include_dirs = [
@ -32,8 +32,8 @@ config("rosen_text_config") {
include_dirs = [
"$rosen_2d_engine_root",
"$flutter_root/engine/flutter/third_party/txt/src",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//third_party/bounds_checking_function/include",
]
}
@ -59,7 +59,7 @@ ohos_source_set("rosen_text_ui") {
"../properties/typography_txt.cpp",
]
deps = [
"//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//third_party/bounds_checking_function:libsec_static",
"//third_party/flutter/build/libtxt:thirdparty_lib_txt_$current_os",
]

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

@ -13,9 +13,9 @@
import("//build/ohos.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
import(
"//foundation/graphic/graphic/rosen/modules/2d_engine/rosen_text/config.gni")
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/config.gni")
## Build 2d_graphics.so
ohos_shared_library("2d_graphics") {
@ -83,7 +83,7 @@ ohos_shared_library("2d_graphics") {
"include",
"src",
"src/engine_adapter",
"//foundation/graphic/graphic/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
"$rosen_2d_engine_root",
"$flutter_root/engine/flutter/third_party/txt/src",
"//foundation/arkui/ace_engine/frameworks",
@ -95,9 +95,9 @@ ohos_shared_library("2d_graphics") {
deps = [
"$ace_flutter_engine_root:flutter_engine_fml_$current_os",
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic/rosen/build/flutter/icu:rosen_libicu_$current_os",
"//foundation/graphic/graphic/rosen/build/flutter/libtxt:thirdparty_lib_txt_rosen_$current_os",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d/rosen/build/flutter/icu:rosen_libicu_$current_os",
"//foundation/graphic/graphic_2d/rosen/build/flutter/libtxt:thirdparty_lib_txt_rosen_$current_os",
"//third_party/bounds_checking_function:libsec_static",
]
@ -159,7 +159,7 @@ ohos_shared_library("2d_graphics_canvaskit0310") {
]
deps = [
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic_2d:libsurface",
# "//third_party/skia_canvaskit0310:skia",
]

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

@ -14,7 +14,7 @@
import("//build/ohos.gni")
config("window_animation_config") {
include_dirs = [ "//foundation/graphic/graphic/rosen/modules/animation/window_animation/include" ]
include_dirs = [ "//foundation/graphic/graphic_2d/rosen/modules/animation/window_animation/include" ]
}
ohos_shared_library("window_animation") {
@ -31,7 +31,7 @@ ohos_shared_library("window_animation") {
cflags_cc = [ "-std=c++17" ]
public_deps = [ "//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client" ]
public_deps = [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client" ]
external_deps = [
"hilog_native:libhilog",

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

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
## Build libcomposer.so
@ -28,13 +28,13 @@ config("composer_config") {
config("composer_public_config") {
include_dirs = [
"//foundation/graphic/graphic/rosen/include/common",
"//foundation/graphic/graphic_2d/rosen/include/common",
"//drivers/peripheral/display/interfaces/include",
"//foundation/graphic/graphic/interfaces/inner_api/vsync_module",
"//foundation/graphic/graphic/interfaces/inner_api/common",
"//foundation/graphic/graphic/rosen/modules/composer/hdi_backend/include",
"//foundation/graphic/graphic/rosen/modules/composer/vsync/include",
"//foundation/graphic/graphic/interfaces/inner_api/composer",
"//foundation/graphic/graphic_2d/interfaces/inner_api/vsync_module",
"//foundation/graphic/graphic_2d/interfaces/inner_api/common",
"//foundation/graphic/graphic_2d/rosen/modules/composer/hdi_backend/include",
"//foundation/graphic/graphic_2d/rosen/modules/composer/vsync/include",
"//foundation/graphic/graphic_2d/interfaces/inner_api/composer",
]
}
@ -48,7 +48,7 @@ ohos_shared_library("libcomposer") {
"hdi_backend/src/hdi_screen.cpp",
]
include_dirs = [ "//foundation/graphic/graphic/utils/log" ]
include_dirs = [ "//foundation/graphic/graphic_2d/utils/log" ]
configs = [ ":composer_config" ]
@ -63,19 +63,19 @@ ohos_shared_library("libcomposer") {
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//drivers/peripheral/display/hal:hdi_display_device",
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic/frameworks/vsync:libvsync_module",
"//foundation/graphic/graphic/utils:libgraphic_utils",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d/frameworks/vsync:libvsync_module",
"//foundation/graphic/graphic_2d/utils:libgraphic_utils",
]
public_deps = [
"vsync:libvsync",
"//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/graphic/graphic/utils:buffer_handle",
"//foundation/graphic/graphic/utils:scoped_bytrace",
"//foundation/graphic/graphic/utils:socketpair",
"//foundation/graphic/graphic/utils:sync_fence",
"//foundation/graphic/graphic_2d/utils:buffer_handle",
"//foundation/graphic/graphic_2d/utils:scoped_bytrace",
"//foundation/graphic/graphic_2d/utils:socketpair",
"//foundation/graphic/graphic_2d/utils:sync_fence",
"//utils/native/base:utils",
]

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

@ -33,9 +33,9 @@ ohos_systemtest("hdibackend_test") {
sources = [ "hdibackend_test.cpp" ]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/composer/hdi_backend/include",
"//foundation/graphic/graphic/rosen/modules/composer/hdi_backend/test",
"//foundation/graphic/graphic/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/rosen/modules/composer/hdi_backend/include",
"//foundation/graphic/graphic_2d/rosen/modules/composer/hdi_backend/test",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
]
cflags = [
@ -45,7 +45,7 @@ ohos_systemtest("hdibackend_test") {
]
deps = [
"//foundation/graphic/graphic/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic_2d/rosen/modules/composer:libcomposer",
"//third_party/googletest:gtest_main",
]
}
@ -59,9 +59,9 @@ ohos_systemtest("hdilayer_test") {
sources = [ "hdilayer_test.cpp" ]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/composer/hdi_backend/include",
"//foundation/graphic/graphic/rosen/modules/composer/hdi_backend/test",
"//foundation/graphic/graphic/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/rosen/modules/composer/hdi_backend/include",
"//foundation/graphic/graphic_2d/rosen/modules/composer/hdi_backend/test",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
]
cflags = [
@ -71,7 +71,7 @@ ohos_systemtest("hdilayer_test") {
]
deps = [
"//foundation/graphic/graphic/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic_2d/rosen/modules/composer:libcomposer",
"//third_party/googletest:gtest_main",
]
}
@ -85,9 +85,9 @@ ohos_systemtest("hdioutput_test") {
sources = [ "hdioutput_test.cpp" ]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/composer/hdi_backend/include",
"//foundation/graphic/graphic/rosen/modules/composer/hdi_backend/test",
"//foundation/graphic/graphic/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/rosen/modules/composer/hdi_backend/include",
"//foundation/graphic/graphic_2d/rosen/modules/composer/hdi_backend/test",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
]
cflags = [
@ -97,7 +97,7 @@ ohos_systemtest("hdioutput_test") {
]
deps = [
"//foundation/graphic/graphic/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic_2d/rosen/modules/composer:libcomposer",
"//third_party/googletest:gtest_main",
]
}
@ -114,9 +114,9 @@ ohos_systemtest("hdiscreen_test") {
]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/composer/hdi_backend/include",
"//foundation/graphic/graphic/rosen/modules/composer/hdi_backend/test",
"//foundation/graphic/graphic/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/rosen/modules/composer/hdi_backend/include",
"//foundation/graphic/graphic_2d/rosen/modules/composer/hdi_backend/test",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
]
cflags = [
@ -126,7 +126,7 @@ ohos_systemtest("hdiscreen_test") {
]
deps = [
"//foundation/graphic/graphic/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic_2d/rosen/modules/composer:libcomposer",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
]

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

@ -100,9 +100,9 @@ ohos_unittest("hdiscreen_test") {
## Build hdibackend_test_common.a {{{
config("hdibackend_test_common_public_config") {
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/composer/hdi_backend/include",
"//foundation/graphic/graphic/rosen/modules/composer/hdi_backend/test",
"//foundation/graphic/graphic/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/rosen/modules/composer/hdi_backend/include",
"//foundation/graphic/graphic_2d/rosen/modules/composer/hdi_backend/test",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
]
cflags = [
@ -121,7 +121,7 @@ ohos_static_library("hdibackend_test_common") {
public_configs = [ ":hdibackend_test_common_public_config" ]
public_deps = [
"//foundation/graphic/graphic/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic_2d/rosen/modules/composer:libcomposer",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
]

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

@ -28,9 +28,9 @@ config("vsync_config") {
config("vsync_public_config") {
include_dirs = [
"//drivers/peripheral/display/interfaces/include",
"//foundation/graphic/graphic/interfaces/inner_api/composer",
"//foundation/graphic/graphic/rosen/include/common",
"//foundation/graphic/graphic/rosen/modules/composer/vsync/include",
"//foundation/graphic/graphic_2d/interfaces/inner_api/composer",
"//foundation/graphic/graphic_2d/rosen/include/common",
"//foundation/graphic/graphic_2d/rosen/modules/composer/vsync/include",
]
}
@ -45,7 +45,7 @@ ohos_shared_library("libvsync") {
"src/vsync_sampler.cpp",
]
include_dirs = [ "//foundation/graphic/graphic/utils/log" ]
include_dirs = [ "//foundation/graphic/graphic_2d/utils/log" ]
configs = [ ":vsync_config" ]
@ -56,14 +56,14 @@ ohos_shared_library("libvsync") {
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/graphic/graphic/utils:libgraphic_utils",
"//foundation/graphic/graphic_2d/utils:libgraphic_utils",
]
public_deps = [
"//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/graphic/graphic/utils:scoped_bytrace",
"//foundation/graphic/graphic/utils:socketpair",
"//foundation/graphic/graphic_2d/utils:scoped_bytrace",
"//foundation/graphic/graphic_2d/utils:socketpair",
"//utils/native/base:utils",
]

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

@ -28,9 +28,9 @@ ohos_systemtest("vsync_test") {
sources = [ "vsync_test.cpp" ]
include_dirs = [
"//foundation/graphic/graphic/interfaces/inner_api/common",
"//foundation/graphic/graphic/rosen/modules/composer/vsync/include",
"//foundation/graphic/graphic/rosen/modules/composer/vsync/test",
"//foundation/graphic/graphic_2d/interfaces/inner_api/common",
"//foundation/graphic/graphic_2d/rosen/modules/composer/vsync/include",
"//foundation/graphic/graphic_2d/rosen/modules/composer/vsync/test",
"//utils/system/safwk/native/include",
]
@ -42,7 +42,7 @@ ohos_systemtest("vsync_test") {
deps = [
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/graphic/rosen/modules/composer/vsync:libvsync",
"//foundation/graphic/graphic_2d/rosen/modules/composer/vsync:libvsync",
"//third_party/googletest:gtest_main",
]
}

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

@ -97,8 +97,8 @@ ohos_unittest("vsync_sampler_test") {
## Build vsync_test_common.a {{{
config("vsync_test_common_public_config") {
include_dirs = [
"//foundation/graphic/graphic/interfaces/inner_api/common",
"//foundation/graphic/graphic/rosen/modules/composer/vsync/include",
"//foundation/graphic/graphic_2d/interfaces/inner_api/common",
"//foundation/graphic/graphic_2d/rosen/modules/composer/vsync/include",
]
cflags = [
@ -117,7 +117,7 @@ ohos_static_library("vsync_test_common") {
public_configs = [ ":vsync_test_common_public_config" ]
public_deps = [
"//foundation/graphic/graphic/rosen/modules/composer/vsync:libvsync",
"//foundation/graphic/graphic_2d/rosen/modules/composer/vsync:libvsync",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
]

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

@ -12,8 +12,8 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic/rosen/modules/effect/effect_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
import("//foundation/graphic/graphic_2d/rosen/modules/effect/effect_config.gni")
## Build libeffectchain.so
@ -35,7 +35,7 @@ config("effect_public_config") {
include_dirs = [
"//third_party/cJSON",
"//foundation/multimedia/image_standard/interfaces/innerkits/include",
"//foundation/graphic/graphic/utils/log",
"//foundation/graphic/graphic_2d/utils/log",
"include",
]
if (effect_enable_gpu) {
@ -48,7 +48,7 @@ ohos_shared_library("libeffectchain") {
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/graphic/graphic/interfaces/kits/napi/graphic/common:graphic_napi_common",
"//foundation/graphic/graphic_2d/interfaces/kits/napi/graphic/common:graphic_napi_common",
"//foundation/multimedia/image_standard:image_framework",
]
@ -74,7 +74,7 @@ ohos_shared_library("libeffectchain") {
"src/vertical_blur_filter.cpp",
]
deps += [ "//foundation/graphic/graphic:libgl" ]
deps += [ "//foundation/graphic/graphic_2d:libgl" ]
}
configs = [ ":effect_config" ]

2
rosen/modules/effect/effect_config.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
effect_enable_gpu = false
if (ace_enable_gpu) {

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

@ -12,17 +12,17 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic/rosen/modules/effect/effect_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
import("//foundation/graphic/graphic_2d/rosen/modules/effect/effect_config.gni")
## Build libegl_effect.so
ohos_shared_library("libegl_effect") {
include_dirs = [
"//foundation/graphic/graphic/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
"//third_party/EGL/api",
"//third_party/openGLES/api",
"//foundation/graphic/graphic/utils/log",
"//foundation/graphic/graphic_2d/utils/log",
"include",
]
@ -47,9 +47,9 @@ ohos_shared_library("libegl_effect") {
sources += [ "src/egl_manager.cpp" ]
deps += [
"//foundation/graphic/graphic:libgl",
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic/interfaces/kits/napi/graphic/common:graphic_napi_common",
"//foundation/graphic/graphic_2d:libgl",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d/interfaces/kits/napi/graphic/common:graphic_napi_common",
]
}

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

@ -12,8 +12,8 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic/rosen/modules/effect/effect_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
import("//foundation/graphic/graphic_2d/rosen/modules/effect/effect_config.gni")
ohos_executable("test_effect_chain") {
sources = []
@ -26,19 +26,19 @@ ohos_executable("test_effect_chain") {
sources = [ "test_effect_chain.cpp" ]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/effect/effectChain/include",
"//foundation/graphic/graphic/rosen/modules/effect/egl/include",
"//foundation/graphic/graphic/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/rosen/modules/effect/effectChain/include",
"//foundation/graphic/graphic_2d/rosen/modules/effect/egl/include",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
"//third_party/EGL/api",
"//third_party/openGLES/api",
]
deps = [
"//foundation/graphic/graphic:libgl",
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic/interfaces/kits/napi/graphic/common:graphic_napi_common",
"//foundation/graphic/graphic/rosen/modules/effect/effectChain:libeffectchain",
"//foundation/graphic/graphic/rosen/modules/effect/egl:libegl_effect",
"//foundation/graphic/graphic_2d:libgl",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d/interfaces/kits/napi/graphic/common:graphic_napi_common",
"//foundation/graphic/graphic_2d/rosen/modules/effect/effectChain:libeffectchain",
"//foundation/graphic/graphic_2d/rosen/modules/effect/egl:libegl_effect",
]
}

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

@ -12,8 +12,8 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic/rosen/modules/effect/effect_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
import("//foundation/graphic/graphic_2d/rosen/modules/effect/effect_config.gni")
module_output_path = "graphic_standard/rosen/modules/effect"
@ -30,10 +30,10 @@ ohos_unittest("EffectTest") {
sources += [ "effect_chain_unittest.cpp" ]
deps += [
"//foundation/graphic/graphic:libgl",
"//foundation/graphic/graphic/interfaces/kits/napi/graphic/common:graphic_napi_common",
"//foundation/graphic/graphic/rosen/modules/effect/effectChain:libeffectchain",
"//foundation/graphic/graphic/rosen/modules/effect/egl:libegl_effect",
"//foundation/graphic/graphic_2d:libgl",
"//foundation/graphic/graphic_2d/interfaces/kits/napi/graphic/common:graphic_napi_common",
"//foundation/graphic/graphic_2d/rosen/modules/effect/effectChain:libeffectchain",
"//foundation/graphic/graphic_2d/rosen/modules/effect/egl:libegl_effect",
]
}
@ -45,8 +45,8 @@ config("effect_test_config") {
include_dirs = [
"//third_party/EGL/api",
"//third_party/openGLES/api",
"//foundation/graphic/graphic/rosen/modules/effect/effectChain/include",
"//foundation/graphic/graphic/rosen/modules/effect/egl/include",
"//foundation/graphic/graphic_2d/rosen/modules/effect/effectChain/include",
"//foundation/graphic/graphic_2d/rosen/modules/effect/egl/include",
]
}

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

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
## Build librender_service.so
ohos_shared_library("librender_service") {
@ -54,22 +54,22 @@ ohos_shared_library("librender_service") {
include_dirs = [
"core",
"//foundation/graphic/graphic/frameworks/surface/include",
"//foundation/graphic/graphic/rosen/include",
"//foundation/graphic/graphic/rosen/modules/composer/vsync/include",
"//foundation/graphic/graphic/rosen/modules/render_service_base/src",
"//foundation/graphic/graphic/rosen/modules/utils",
"//foundation/graphic/graphic_2d/frameworks/surface/include",
"//foundation/graphic/graphic_2d/rosen/include",
"//foundation/graphic/graphic_2d/rosen/modules/composer/vsync/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/src",
"//foundation/graphic/graphic_2d/rosen/modules/utils",
"//utils/native/base/include",
"//utils/system/safwk/native/include",
"//foundation/graphic/graphic/utils/log",
"//foundation/graphic/graphic_2d/utils/log",
]
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic:libwmclient",
"//foundation/graphic/graphic/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d:libwmclient",
"//foundation/graphic/graphic_2d/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
"//utils/native/base:utils",
]
@ -98,8 +98,8 @@ ohos_executable("render_service") {
deps = [
":librender_service",
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/graphic/graphic/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
]
external_deps = [ "ipc:ipc_core" ]
@ -113,14 +113,14 @@ ohos_executable("render_service_dump") {
sources = [ "dump/render_service_dump.cpp" ]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/render_service_base/include",
"//foundation/graphic/graphic/rosen/modules/render_service_base/src",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/src",
"//utils/system/safwk/native/include",
]
deps = [ "//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base" ]
deps = [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base" ]
public_deps = [ "//foundation/graphic/graphic:libsurface" ]
public_deps = [ "//foundation/graphic/graphic_2d:libsurface" ]
external_deps = [
"ipc:ipc_core",

10
rosen/modules/render_service/core/screen_manager/test/unittest/BUILD.gn
View File

@ -24,7 +24,7 @@ group("unittest") {
## Build rs_screen_manager_test {{{
ohos_unittest("rs_screen_manager_test") {
include_dirs = [ "//foundation/graphic/graphic/rosen/modules/render_service/core/screen_manager" ]
include_dirs = [ "//foundation/graphic/graphic_2d/rosen/modules/render_service/core/screen_manager" ]
module_out_path = module_out_path
@ -33,9 +33,9 @@ ohos_unittest("rs_screen_manager_test") {
deps = [
":rs_screen_manager_test_common",
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
"//utils/native/base:utils",
]
}
@ -60,7 +60,7 @@ ohos_static_library("rs_screen_manager_test_common") {
public_configs = [ ":rs_screen_manager_test_common_config" ]
public_deps = [
"//foundation/graphic/graphic/rosen/modules/render_service:librender_service",
"//foundation/graphic/graphic_2d/rosen/modules/render_service:librender_service",
"//third_party/googletest:gtest_main",
]
}

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

@ -12,19 +12,19 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
import(
"//foundation/graphic/graphic/rosen/modules/render_service_base/config.gni")
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/config.gni")
config("export_config") {
cflags_cc = [ "-std=c++17" ]
include_dirs = [
"include",
"//foundation/graphic/graphic/rosen/include",
"//foundation/graphic/graphic_2d/rosen/include",
"//drivers/peripheral/display/interfaces/include",
"//foundation/multimedia/image_standard/interfaces/innerkits/include",
"//foundation/graphic/graphic/interfaces/inner_api/surface",
"//foundation/graphic/graphic/interfaces/inner_api/composer",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/interfaces/inner_api/composer",
]
defines = rs_common_define
@ -126,10 +126,11 @@ ohos_shared_library("librender_service_base") {
"src/screen_manager/rs_screen_props.cpp",
]
include_dirs =
[ "//foundation/graphic/graphic/rosen/modules/render_service_base/src" ]
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/src",
]
deps = [ "//foundation/graphic/graphic/rosen/modules/render_service_base/src/platform:platform" ]
deps = [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/src/platform:platform" ]
public_deps = [
"src/platform:platform",

2
rosen/modules/render_service_base/src/platform/BUILD.gn
View File

@ -12,7 +12,7 @@
# limitations under the License.
import(
"//foundation/graphic/graphic/rosen/modules/render_service_base/config.gni")
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/config.gni")
group("platform") {
if (rosen_is_ohos) {

2
rosen/modules/render_service_base/src/platform/darwin/BUILD.gn
View File

@ -28,7 +28,7 @@ source_set("rosen_darwin_sources") {
]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/render_service_base/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
]
deps = []

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

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
group("ohos") {
public_deps = [ ":rosen_ohos_sources" ]
@ -20,13 +20,13 @@ group("ohos") {
config("export_config") {
include_dirs = [
"//foundation/graphic/graphic/rosen/include",
"//foundation/graphic/graphic/rosen/modules/composer/vsync/include",
"//foundation/graphic/graphic_2d/rosen/include",
"//foundation/graphic/graphic_2d/rosen/modules/composer/vsync/include",
"//utils/native/base/include",
"//utils/system/safwk/native/include",
"//foundation/graphic/graphic/frameworks/surface/src",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/frameworks/surface/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/multimedia/image_standard/interfaces/innerkits/include",
]
}
@ -58,32 +58,32 @@ ohos_source_set("rosen_ohos_sources") {
"backend/rs_surface_ohos_gl.cpp",
]
sources += [ "//foundation/graphic/graphic/rosen/modules/2d_graphics/src/render_context/render_context.cpp" ]
sources += [ "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/render_context/render_context.cpp" ]
}
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/render_service_base/include",
"//foundation/graphic/graphic/rosen/modules/render_service_base/src",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/src",
"//utils/native/base/include",
"//utils/system/safwk/native/include",
"//foundation/graphic/graphic/prebuilts/librarys/gpu/include",
"//foundation/graphic/graphic_2d/prebuilts/librarys/gpu/include",
"//drivers/peripheral/display/interfaces/include/",
"//foundation/graphic/graphic/rosen/modules/render_service_client/core",
"//foundation/graphic/graphic/utils/log",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client/core",
"//foundation/graphic/graphic_2d/utils/log",
]
public_deps = [
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic:libvsync_client",
"//foundation/graphic/graphic/rosen/modules/composer/vsync:libvsync",
"//foundation/graphic/graphic/utils:sync_fence",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d:libvsync_client",
"//foundation/graphic/graphic_2d/rosen/modules/composer/vsync:libvsync",
"//foundation/graphic/graphic_2d/utils:sync_fence",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//third_party/flutter/build/skia:ace_skia_ohos",
"//utils/native/base:utils",
]
if (ace_enable_gpu) {
public_deps += [ "//foundation/graphic/graphic:libgl" ]
public_deps += [ "//foundation/graphic/graphic_2d:libgl" ]
}
external_deps = [

2
rosen/modules/render_service_base/src/platform/windows/BUILD.gn
View File

@ -28,7 +28,7 @@ source_set("rosen_windows_sources") {
]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/render_service_base/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
]
deps = []

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

@ -18,7 +18,7 @@ ohos_executable("render_service_client") {
include_dirs = []
deps = [ "//foundation/graphic/graphic/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"
subsystem_name = "graphic"

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

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
import("render_service_client.gni")
config("render_service_client_config") {
@ -20,9 +20,9 @@ config("render_service_client_config") {
"$rosen_root/modules",
"$rosen_root/modules/render_service_client/core",
"$rosen_root/modules/render_service_base/include",
"//foundation/graphic/graphic/interfaces/inner_api/common",
"//foundation/graphic/graphic/interfaces/inner_api/surface",
"//foundation/graphic/graphic/interfaces/inner_api/composer",
"//foundation/graphic/graphic_2d/interfaces/inner_api/common",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/interfaces/inner_api/composer",
"//drivers/peripheral/display/interfaces/include",
"//drivers/peripheral/base",
]
@ -36,8 +36,8 @@ ohos_source_set("render_service_client_src") {
"$rosen_root/modules/render_service_base/src",
"$rosen_root/modules/2d_graphics/src",
"//foundation/graphic/utils/log",
"//foundation/graphic/graphic/utils/log",
"//foundation/graphic/graphic/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/utils/log",
"//foundation/graphic/graphic_2d/interfaces/inner_api/surface",
]
sources = [

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

@ -13,9 +13,9 @@
import("//build/test.gni")
import(
"//foundation/graphic/graphic/rosen/modules/render_service_client/render_service_client.gni")
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client/render_service_client.gni")
#import("//foundation/graphic/graphic/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"

2
rosen/modules/render_service_client/render_service_client.gni
View File

@ -15,7 +15,7 @@ import("//build/ohos.gni")
declare_args() {
enable_export_macro = true
rosen_root = "//foundation/graphic/graphic/rosen"
rosen_root = "//foundation/graphic/graphic_2d/rosen"
rss_enabled = false
if (defined(global_parts_info) &&

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

@ -24,19 +24,19 @@ ohos_executable("render_service_client_rs_demo") {
include_dirs = [
# render_service_base include
"//foundation/graphic/graphic/rosen/modules/render_service_base/src",
"//foundation/graphic/graphic/rosen/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/src",
"//foundation/graphic/graphic_2d/rosen/include",
"//drivers/peripheral/display/interfaces/include",
"//foundation/multimedia/image_standard/interfaces/innerkits/include",
]
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/graphic/graphic:libvsync_client",
"//foundation/graphic/graphic:libwmclient",
"//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d:libvsync_client",
"//foundation/graphic/graphic_2d:libwmclient",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//third_party/zlib:libz",
]
@ -54,9 +54,9 @@ ohos_executable("render_service_client_app_demo") {
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wmserver:libwms",
"//third_party/zlib:libz",
@ -76,9 +76,9 @@ ohos_executable("render_service_client_rs_animation_demo") {
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wmserver:libwms",
"//third_party/zlib:libz",
@ -95,11 +95,11 @@ ohos_executable("surface_capture_demo") {
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/graphic/graphic:libvsync_client",
"//foundation/graphic/graphic:libwmclient",
"//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d:libvsync_client",
"//foundation/graphic/graphic_2d:libwmclient",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//third_party/zlib:libz",
]
@ -115,8 +115,8 @@ ohos_executable("security_layer_demo") {
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
]
part_name = "graphic_standard"
@ -128,18 +128,19 @@ ohos_executable("mirror_display_demo") {
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/graphic/graphic:libvsync_client",
"//foundation/graphic/graphic:libwmclient",
"//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d:libvsync_client",
"//foundation/graphic/graphic_2d:libwmclient",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//third_party/libpng:libpng",
"//third_party/zlib:libz",
]
include_dirs =
[ "//foundation/graphic/graphic/rosen/modules/render_service_base/src" ]
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/src",
]
public_deps = [ "//third_party/flutter/build/skia:ace_skia_ohos" ]
@ -154,8 +155,8 @@ ohos_executable("render_service_client_surface_node_demo") {
deps = [
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wmserver:libwms",
"//third_party/zlib:libz",

4
rosen/modules/render_service_client/test/render_service_client_rs_demo.cpp
View File

@ -33,8 +33,8 @@
#include "ui/rs_surface_node.h"
#include "render_context/render_context.h"
// temporary debug
#include "foundation/graphic/graphic/rosen/modules/render_service_base/src/platform/ohos/rs_surface_frame_ohos.h"
#include "foundation/graphic/graphic/rosen/modules/render_service_base/src/platform/ohos/rs_surface_ohos.h"
#include "foundation/graphic/graphic_2d/rosen/modules/render_service_base/src/platform/ohos/rs_surface_frame_ohos.h"
#include "foundation/graphic/graphic_2d/rosen/modules/render_service_base/src/platform/ohos/rs_surface_ohos.h"
using namespace OHOS;
using namespace OHOS::Rosen;

2
rosen/modules/render_service_client/test/render_service_client_surface_node_demo.cpp
View File

@ -53,7 +53,7 @@ using namespace std;
std::map<std::string, std::function<int32_t()>> playerTable;
// If you want compile this demo, please add
// "//foundation/graphic/graphic/rosen/modules/render_service_client/test:render_service_client_surface_node_demo",
// "//foundation/graphic/graphic_2d/rosen/modules/render_service_client/test:render_service_client_surface_node_demo",
// to bundle.json.
// and add "multimedia_media_standard:media_client" to external_deps in BUILD.gn.
// Attention: Before use this demo, please push any mp4 file which must be renamed "H264_Main.mp4" to /data,

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

@ -31,8 +31,8 @@ ohos_unittest("RSInterfacesTest") {
## Build rs_client_test_common.a {{{
config("rs_client_test_common_public_config") {
include_dirs = [
"//foundation/graphic/graphic/frameworks/surface/include",
"//foundation/graphic/graphic/rosen/modules/render_service_client/core",
"//foundation/graphic/graphic_2d/frameworks/surface/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client/core",
]
cflags = [
@ -53,9 +53,9 @@ ohos_static_library("rs_client_test_common") {
public_deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//third_party/googletest:gtest_main",
"//utils/native/base:utils",
]

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

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
ohos_executable("drawing_engine_sample") {
install_enable = true
@ -54,10 +54,10 @@ ohos_executable("drawing_engine_sample") {
"include",
"drawing_engine",
"drawing_engine/drawing_surface",
"//foundation/graphic/graphic/rosen/modules/composer/hdi_backend/include",
"//foundation/graphic/graphic/interfaces/inner_api/vsync_module",
"//foundation/graphic/graphic/utils/sync_fence/export",
"//foundation/graphic/graphic/rosen/include/common",
"//foundation/graphic/graphic_2d/rosen/modules/composer/hdi_backend/include",
"//foundation/graphic/graphic_2d/interfaces/inner_api/vsync_module",
"//foundation/graphic/graphic_2d/utils/sync_fence/export",
"//foundation/graphic/graphic_2d/rosen/include/common",
]
sources += [
@ -74,11 +74,11 @@ ohos_executable("drawing_engine_sample") {
]
deps = [
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic:libvsync_client",
"//foundation/graphic/graphic/frameworks/vsync:libvsync_module",
"//foundation/graphic/graphic/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic/utils:sync_fence",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d:libvsync_client",
"//foundation/graphic/graphic_2d/frameworks/vsync:libvsync_module",
"//foundation/graphic/graphic_2d/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic_2d/utils:sync_fence",
"//third_party/flutter/build/skia:ace_skia_ohos",
]
@ -105,21 +105,21 @@ ohos_executable("drawing_sample_rs") {
sources = [ "drawing_c_sample.cpp" ]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic/rosen/modules/render_service_base/src",
"//foundation/graphic/graphic/rosen/modules/render_service_base/include",
"//foundation/graphic/graphic/rosen/modules/render_service_client",
"//foundation/graphic/graphic/interfaces/inner_api/vsync_module",
"//foundation/graphic/graphic/rosen/include/common",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/src",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client",
"//foundation/graphic/graphic_2d/interfaces/inner_api/vsync_module",
"//foundation/graphic/graphic_2d/rosen/include/common",
"//foundation/windowmanager/interfaces/innerkits/wm",
]
deps = [
"//foundation/graphic/graphic:libvsync_client",
"//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d:libvsync_client",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/wm:libwm",
"//third_party/zlib:libz",
]
@ -139,23 +139,23 @@ ohos_executable("drawing_sample_canvaskit0310") {
sources = [ "drawing_sample_canvaskit0310.cpp" ]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/composer/hdi_backend/include",
"//foundation/graphic/graphic_2d/rosen/modules/composer/hdi_backend/include",
"//drivers/peripheral/display/interfaces/include",
"//foundation/graphic/graphic/rosen/include/common",
"//foundation/graphic/graphic/interfaces/inner_api/vsync_module",
"//foundation/graphic/graphic/interfaces/inner_api/common",
"//foundation/graphic/graphic/rosen/modules/composer/vsync/include",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/include/common",
"//foundation/graphic/graphic_2d/interfaces/inner_api/vsync_module",
"//foundation/graphic/graphic_2d/interfaces/inner_api/common",
"//foundation/graphic/graphic_2d/rosen/modules/composer/vsync/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
]
deps = [
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic:libvsync_client",
"//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics_canvaskit0310",
"//foundation/graphic/graphic/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic/utils:libgraphic_utils",
"//foundation/graphic/graphic/utils:sync_fence",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d:libvsync_client",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics_canvaskit0310",
"//foundation/graphic/graphic_2d/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic_2d/utils:libgraphic_utils",
"//foundation/graphic/graphic_2d/utils:sync_fence",
]
external_deps = [

4
rosen/samples/2d_graphics/drawing_c_sample.cpp
View File

@ -32,8 +32,8 @@
#include "core/ui/rs_display_node.h"
#include "core/ui/rs_surface_node.h"
// temporary debug
#include "foundation/graphic/graphic/rosen/modules/render_service_base/src/platform/ohos/rs_surface_frame_ohos.h"
#include "foundation/graphic/graphic/rosen/modules/render_service_base/src/platform/ohos/rs_surface_ohos.h"
#include "foundation/graphic/graphic_2d/rosen/modules/render_service_base/src/platform/ohos/rs_surface_frame_ohos.h"
#include "foundation/graphic/graphic_2d/rosen/modules/render_service_base/src/platform/ohos/rs_surface_ohos.h"
#include "c/drawing_canvas.h"
#include "c/drawing_color.h"

4
rosen/samples/2d_graphics/drawing_sample_rs.cpp
View File

@ -31,8 +31,8 @@
#include "core/ui/rs_display_node.h"
#include "core/ui/rs_surface_node.h"
// temporary debug
#include "foundation/graphic/graphic/rosen/modules/render_service_base/src/platform/ohos/rs_surface_frame_ohos.h"
#include "foundation/graphic/graphic/rosen/modules/render_service_base/src/platform/ohos/rs_surface_ohos.h"
#include "foundation/graphic/graphic_2d/rosen/modules/render_service_base/src/platform/ohos/rs_surface_frame_ohos.h"
#include "foundation/graphic/graphic_2d/rosen/modules/render_service_base/src/platform/ohos/rs_surface_ohos.h"
#include "draw/color.h"

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

@ -45,23 +45,23 @@ ohos_executable("drawing_sample") {
configs = [ ":drawing_sample_config" ]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic/rosen/samples/2d_graphics/test/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/samples/2d_graphics/test/include",
"//foundation/multimedia/image_standard/interfaces/innerkits/include",
"//foundation/graphic/graphic/rosen/modules/composer/hdi_backend/include",
"//foundation/graphic/graphic_2d/rosen/modules/composer/hdi_backend/include",
"//drivers/peripheral/display/interfaces/include",
"//foundation/graphic/graphic/rosen/include/common",
"//foundation/graphic/graphic/rosen/modules/composer/vsync/include",
"//foundation/graphic/graphic/interfaces/inner_api/composer",
"//foundation/graphic/graphic_2d/rosen/include/common",
"//foundation/graphic/graphic_2d/rosen/modules/composer/vsync/include",
"//foundation/graphic/graphic_2d/interfaces/inner_api/composer",
]
deps = [
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic/utils:libgraphic_utils",
"//foundation/graphic/graphic/utils:sync_fence",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic_2d/utils:libgraphic_utils",
"//foundation/graphic/graphic_2d/utils:sync_fence",
"//third_party/flutter/build/skia:ace_skia_ohos",
]

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

@ -26,12 +26,12 @@ config("hello_composer_config") {
config("hello_composer_public_config") {
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/composer/hdi_backend/include",
"//foundation/graphic/graphic_2d/rosen/modules/composer/hdi_backend/include",
"//drivers/peripheral/display/interfaces/include",
"//foundation/graphic/graphic/rosen/include/common",
"//foundation/graphic/graphic/rosen/modules/composer/vsync/include",
"//foundation/graphic/graphic/rosen/modules/render_service_base/src",
"//foundation/graphic/graphic/interfaces/inner_api/composer",
"//foundation/graphic/graphic_2d/rosen/include/common",
"//foundation/graphic/graphic_2d/rosen/modules/composer/vsync/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/src",
"//foundation/graphic/graphic_2d/interfaces/inner_api/composer",
]
}
@ -50,11 +50,11 @@ ohos_executable("hello_composer") {
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/graphic/graphic:libsurface",
"//foundation/graphic/graphic/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic/utils:libgraphic_utils",
"//foundation/graphic/graphic/utils:sync_fence",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/graphic/graphic_2d/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d/utils:libgraphic_utils",
"//foundation/graphic/graphic_2d/utils:sync_fence",
]
external_deps = [ "ipc:ipc_core" ]

30
rosen/samples/text/renderservice/BUILD.gn
View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
import("//third_party/wayland_standard/wayland_protocol.gni")
ohos_executable("rendertest") {
@ -21,25 +21,25 @@ ohos_executable("rendertest") {
sources = [ "drawing_text_c_sample.cpp" ]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic/rosen/modules/render_service_base",
"//foundation/graphic/graphic/rosen/modules/render_service_base/src",
"//foundation/graphic/graphic/rosen/modules/render_service_base/include",
"//foundation/graphic/graphic/rosen/modules/render_service_client",
"//foundation/graphic/graphic/interfaces/inner_api/vsync_module",
"//foundation/graphic/graphic/rosen/include/common",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/src",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client",
"//foundation/graphic/graphic_2d/interfaces/inner_api/vsync_module",
"//foundation/graphic/graphic_2d/rosen/include/common",
"//foundation/windowmanager/interfaces/innerkits/wm",
"//foundation/graphic/graphic/rosen/2d_engine/ui",
"//foundation/graphic/graphic_2d/rosen/2d_engine/ui",
]
configs = [ "//foundation/graphic/graphic/rosen/modules/2d_engine/rosen_text/ui:rosen_text_ui_config" ]
configs = [ "//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/ui:rosen_text_ui_config" ]
deps = [
"//foundation/graphic/graphic:libvsync_client",
"//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d:libvsync_client",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/wm:libwm",
"//third_party/zlib:libz",
]

4
rosen/samples/text/renderservice/main.cpp
View File

@ -37,8 +37,8 @@
#include "display_type.h"
#include "draw/canvas.h"
#include "draw/pen.h"
#include "foundation/graphic/graphic/rosen/modules/render_service_base/src/platform/ohos/rs_surface_frame_ohos.h"
#include "foundation/graphic/graphic/rosen/modules/render_service_base/src/platform/ohos/rs_surface_ohos.h"
#include "foundation/graphic/graphic_2d/rosen/modules/render_service_base/src/platform/ohos/rs_surface_frame_ohos.h"
#include "foundation/graphic/graphic_2d/rosen/modules/render_service_base/src/platform/ohos/rs_surface_ohos.h"
#include "image/bitmap.h"
#include "pipeline/rs_render_result.h"
#include "pipeline/rs_render_thread.h"

10
rosen/test/2d_graphics/fuzztest/bitmapbuild_fuzzer/BUILD.gn
View File

@ -19,7 +19,7 @@ module_output_path = "graphic/2d_graphics"
##############################fuzztest##########################################
ohos_fuzztest("BitmapBuildFuzzTest") {
module_out_path = module_output_path
fuzz_config_file = "//foundation/graphic/graphic/rosen/test/2d_graphics/fuzztest/bitmapbuild_fuzzer"
fuzz_config_file = "//foundation/graphic/graphic_2d/rosen/test/2d_graphics/fuzztest/bitmapbuild_fuzzer"
sources = [ "bitmapbuild_fuzzer.cpp" ]
@ -31,11 +31,13 @@ ohos_fuzztest("BitmapBuildFuzzTest") {
]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
]
deps = [ "//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics" ]
deps = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
]
external_deps = [
"hilog_native:libhilog",

10
rosen/test/2d_graphics/fuzztest/matrixget_fuzzer/BUILD.gn
View File

@ -19,7 +19,7 @@ module_output_path = "graphic/2d_graphics"
##############################fuzztest##########################################
ohos_fuzztest("MatrixGetFuzzTest") {
module_out_path = module_output_path
fuzz_config_file = "//foundation/graphic/graphic/rosen/test/2d_graphics/fuzztest/matrixget_fuzzer"
fuzz_config_file = "//foundation/graphic/graphic_2d/rosen/test/2d_graphics/fuzztest/matrixget_fuzzer"
sources = [ "matrixget_fuzzer.cpp" ]
@ -31,11 +31,13 @@ ohos_fuzztest("MatrixGetFuzzTest") {
]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
]
deps = [ "//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics" ]
deps = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
]
external_deps = [
"hilog_native:libhilog",

10
rosen/test/2d_graphics/fuzztest/pathinterpolate_fuzzer/BUILD.gn
View File

@ -19,7 +19,7 @@ module_output_path = "graphic/2d_graphics"
##############################fuzztest##########################################
ohos_fuzztest("PathInterpolateFuzzTest") {
module_out_path = module_output_path
fuzz_config_file = "//foundation/graphic/graphic/rosen/test/2d_graphics/fuzztest/pathinterpolate_fuzzer"
fuzz_config_file = "//foundation/graphic/graphic_2d/rosen/test/2d_graphics/fuzztest/pathinterpolate_fuzzer"
sources = [ "pathinterpolate_fuzzer.cpp" ]
@ -31,11 +31,13 @@ ohos_fuzztest("PathInterpolateFuzzTest") {
]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
]
deps = [ "//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics" ]
deps = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
]
external_deps = [
"hilog_native:libhilog",

10
rosen/test/2d_graphics/fuzztest/pathop_fuzzer/BUILD.gn
View File

@ -19,7 +19,7 @@ module_output_path = "graphic/2d_graphics"
##############################fuzztest##########################################
ohos_fuzztest("PathOpFuzzTest") {
module_out_path = module_output_path
fuzz_config_file = "//foundation/graphic/graphic/rosen/test/2d_graphics/fuzztest/pathop_fuzzer"
fuzz_config_file = "//foundation/graphic/graphic_2d/rosen/test/2d_graphics/fuzztest/pathop_fuzzer"
sources = [ "pathop_fuzzer.cpp" ]
@ -31,11 +31,13 @@ ohos_fuzztest("PathOpFuzzTest") {
]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
]
deps = [ "//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics" ]
deps = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
]
external_deps = [
"hilog_native:libhilog",

9
rosen/test/2d_graphics/fuzztest/setargb_fuzzer/BUILD.gn
View File

@ -19,7 +19,7 @@ module_output_path = "graphic/2d_graphics"
##############################fuzztest##########################################
ohos_fuzztest("SetArgbFuzzTest") {
module_out_path = module_output_path
fuzz_config_file = "//foundation/graphic/graphic/rosen/test/2d_graphics/fuzztest/setargb_fuzzer"
fuzz_config_file = "//foundation/graphic/graphic_2d/rosen/test/2d_graphics/fuzztest/setargb_fuzzer"
sources = [ "setargb_fuzzer.cpp" ]
@ -30,9 +30,12 @@ ohos_fuzztest("SetArgbFuzzTest") {
"-fno-omit-frame-pointer",
]
include_dirs = [ "//foundation/graphic/graphic/rosen/modules/2d_graphics/include" ]
include_dirs =
[ "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include" ]
deps = [ "//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics" ]
deps = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
]
external_deps = [
"hilog_native:libhilog",

10
rosen/test/2d_graphics/fuzztest/setcamerapos_fuzzer/BUILD.gn
View File

@ -19,7 +19,7 @@ module_output_path = "graphic/2d_graphics"
##############################fuzztest##########################################
ohos_fuzztest("SetCameraPosFuzzTest") {
module_out_path = module_output_path
fuzz_config_file = "//foundation/graphic/graphic/rosen/test/2d_graphics/fuzztest/setcamerapos_fuzzer"
fuzz_config_file = "//foundation/graphic/graphic_2d/rosen/test/2d_graphics/fuzztest/setcamerapos_fuzzer"
sources = [ "setcamerapos_fuzzer.cpp" ]
@ -31,11 +31,13 @@ ohos_fuzztest("SetCameraPosFuzzTest") {
]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
]
deps = [ "//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics" ]
deps = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
]
external_deps = [
"hilog_native:libhilog",

6
rosen/test/2d_graphics/unittest/draw/BUILD.gn
View File

@ -28,14 +28,14 @@ ohos_unittest("2d_graphics_draw_test") {
include_dirs = [
"//third_party/googletest/googletest/include",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//utils/native/base/include",
]
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
]
part_name = "graphic_standard"

6
rosen/test/2d_graphics/unittest/effect/BUILD.gn
View File

@ -30,14 +30,14 @@ ohos_unittest("2d_graphics_effect_test") {
include_dirs = [
"//third_party/googletest/googletest/include",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//utils/native/base/include",
]
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
]
part_name = "graphic_standard"

6
rosen/test/2d_graphics/unittest/image/BUILD.gn
View File

@ -25,14 +25,14 @@ ohos_unittest("2d_graphics_image_test") {
]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//third_party/googletest/googletest/include",
]
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//third_party/googletest:gtest_main",
"//utils/native/base:utils",
]

6
rosen/test/2d_graphics/unittest/utils/BUILD.gn
View File

@ -30,14 +30,14 @@ ohos_unittest("2d_graphics_utils_test") {
]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//third_party/googletest/googletest/include",
]
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/graphic/graphic/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//third_party/googletest:gtest_main",
"//utils/native/base:utils",
]

16
rosen/test/render_service/render_service/unittest/pipeline/BUILD.gn
View File

@ -34,17 +34,17 @@ ohos_unittest("RSRenderServiceCommonPipelineTest") {
]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/render_service/core",
"//foundation/graphic/graphic/rosen/modules/render_service_base/src",
"//foundation/graphic/graphic/rosen/include",
"//foundation/graphic/graphic/rosen/test/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service/core",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/src",
"//foundation/graphic/graphic_2d/rosen/include",
"//foundation/graphic/graphic_2d/rosen/test/include",
]
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/graphic/graphic/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic/rosen/modules/render_service:librender_service",
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d/rosen/modules/composer:libcomposer",
"//foundation/graphic/graphic_2d/rosen/modules/render_service:librender_service",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
"//third_party/googletest:gtest_main",
"//utils/native/base:utils",
]
@ -56,7 +56,7 @@ ohos_unittest("RSRenderServiceCommonPipelineTest") {
config("pipeline_test") {
#visibility = [ ":*" ]
include_dirs =
[ "//foundation/graphic/graphic/rosen/modules/render_service/core" ]
[ "//foundation/graphic/graphic_2d/rosen/modules/render_service/core" ]
}
group("unittest") {

12
rosen/test/render_service/render_service_base/unittest/render/BUILD.gn
View File

@ -25,17 +25,17 @@ ohos_unittest("RSRenderServiceBaseRenderTest") {
configs = [
":render_test",
"$ace_root:ace_test_config",
"//foundation/graphic/graphic/rosen/modules/render_service_base:export_config",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:export_config",
]
include_dirs = [
"//foundation/graphic/graphic/rosen/modules/render_service_base/include",
"//foundation/graphic/graphic/rosen/include",
"//foundation/graphic/graphic/rosen/test/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
"//foundation/graphic/graphic_2d/rosen/include",
"//foundation/graphic/graphic_2d/rosen/test/include",
]
deps = [
"//foundation/graphic/graphic/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
"//third_party/flutter/build/skia:ace_skia_ohos",
"//third_party/googletest:gtest_main",
"//utils/native/base:utils",
@ -49,7 +49,7 @@ config("render_test") {
visibility = [ ":*" ]
include_dirs = [
"$ace_root",
"//foundation/graphic/graphic/rosen/modules/render_service_base",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base",
]
}

6
rosen/test/render_service/render_service_client/unittest/transaction/BUILD.gn
View File

@ -25,11 +25,11 @@ ohos_unittest("RSRenderTransactionTest") {
configs = [
":ui_test",
"$ace_root:ace_test_config",
"//foundation/graphic/graphic/rosen/modules/render_service_client:render_service_client_config",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:render_service_client_config",
]
deps = [
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//third_party/googletest:gtest_main",
"//utils/native/base:utils",
]
@ -42,7 +42,7 @@ config("ui_test") {
visibility = [ ":*" ]
include_dirs = [
"$ace_root",
"//foundation/graphic/graphic/rosen/modules/render_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client",
]
}

8
rosen/test/render_service/render_service_client/unittest/ui/BUILD.gn
View File

@ -29,16 +29,16 @@ ohos_unittest("RSRenderServiceClientUITest") {
"rs_ui_director_test.cpp",
]
include_dirs = [ "//foundation/graphic/graphic/rosen/test/include" ]
include_dirs = [ "//foundation/graphic/graphic_2d/rosen/test/include" ]
configs = [
":ui_test",
"$ace_root:ace_test_config",
"//foundation/graphic/graphic/rosen/modules/render_service_client:render_service_client_config",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:render_service_client_config",
]
deps = [
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"//third_party/googletest:gtest_main",
"//utils/native/base:utils",
]
@ -51,7 +51,7 @@ config("ui_test") {
visibility = [ ":*" ]
include_dirs = [
"$ace_root",
"//foundation/graphic/graphic/rosen/modules/render_service_client",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client",
]
}

7
utils/BUILD.gn
View File

@ -12,12 +12,12 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
if (color_gamut_enable) {
group("color_manager_unit_test") {
testonly = true
deps = [ "//foundation/graphic/graphic/utils/color_manager:test" ]
deps = [ "//foundation/graphic/graphic_2d/utils/color_manager:test" ]
}
group("color_manager") {
@ -83,7 +83,8 @@ group("sync_fence") {
## Build libgraphic_utils.so {{{
config("libgraphic_utils_public_config") {
include_dirs = [ "//foundation/graphic/graphic/interfaces/inner_api/common" ]
include_dirs =
[ "//foundation/graphic/graphic_2d/interfaces/inner_api/common" ]
}
ohos_shared_library("libgraphic_utils") {

2
utils/color_manager/test/BUILD.gn
View File

@ -44,7 +44,7 @@ ohos_static_library("color_manager_test_common") {
public_deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/graphic/graphic/utils/color_manager:color_manager",
"//foundation/graphic/graphic_2d/utils/color_manager:color_manager",
"//third_party/flutter/build/skia:ace_skia_ohos",
"//third_party/googletest:gtest_main",
]

4
utils/gl_utils/BUILD.gn
View File

@ -12,7 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/graphic/graphic/graphic_config.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
## Build gl_utils.a {{{
config("gl_utils_config") {
@ -55,7 +55,7 @@ ohos_static_library("gl_utils") {
public_deps = [
"..:libgslogger",
"..:matrix",
"//foundation/graphic/graphic:libgl",
"//foundation/graphic/graphic_2d:libgl",
]
part_name = "graphic_standard"

2
utils/lex_yacc/lex_yacc.gni
View File

@ -13,7 +13,7 @@
import("//build/ohos.gni")
gni_filepath = "//foundation/graphic/graphic/utils/lex_yacc"
gni_filepath = "//foundation/graphic/graphic_2d/utils/lex_yacc"
template("lex_yacc") {
lex_name = invoker.lex

3
utils/sync_fence/test/unittest/BUILD.gn
View File

@ -49,7 +49,8 @@ ohos_static_library("sync_fence_common") {
public_configs = [ ":sync_fence_common_public_config" ]
public_deps = [ "//foundation/graphic/graphic/utils/sync_fence:sync_fence" ]
public_deps =
[ "//foundation/graphic/graphic_2d/utils/sync_fence:sync_fence" ]
subsystem_name = "graphic"
part_name = "graphic_standard"
}

4
utils/wmlayout/wmlayout.gni
View File

@ -13,7 +13,7 @@
import("//build/ohos.gni")
wmlayout_scss_gni_filepath = "//foundation/graphic/graphic/utils/wmlayout"
wmlayout_scss_gni_filepath = "//foundation/graphic/graphic_2d/utils/wmlayout"
template("wmlayout_scss") {
scss_name = invoker.scss
@ -28,7 +28,7 @@ template("wmlayout_scss") {
scss_name,
]
outputs = [ scss_filename ]
label = "//foundation/graphic/graphic/frameworks/wmserver/src/wmlayout_scss_parser:wmlayout_scss_parser($host_toolchain)"
label = "//foundation/graphic/graphic_2d/frameworks/wmserver/src/wmlayout_scss_parser:wmlayout_scss_parser($host_toolchain)"
deps = [ label ]
args = [
"--cmd",