!5174 部件化整改_graphic_graphic_2d

Merge pull request !5174 from 刘宇锋/master
This commit is contained in:
openharmony_ci 2023-07-11 11:17:01 +00:00 committed by Gitee
commit 94a4069aef
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 16 additions and 19 deletions

View File

@ -77,8 +77,9 @@
"bounds_checking_function",
"icu",
"libpng",
"zilb",
"skia"
"zlib",
"skia",
"cjson"
]
},
"build": {

View File

@ -57,9 +57,6 @@ ohos_executable("bootanimation") {
"$graphic_2d_root/rosen/modules/2d_graphics:2d_graphics",
"$graphic_2d_root/rosen/modules/render_service_base/src/platform:platform",
"$graphic_2d_root/rosen/modules/render_service_client:librender_service_client",
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//foundation/multimedia/player_framework/interfaces/inner_api/native:media_client",
"//foundation/window/window_manager/dm:libdm",
"//third_party/cJSON:cjson_static",
"//third_party/zlib:libz",
]
@ -79,7 +76,10 @@ ohos_executable("bootanimation") {
"hilog:libhilog",
"hitrace:hitrace_meter",
"ipc:ipc_core",
"player_framework:media_client",
"resource_management:global_resmgr",
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
]

View File

@ -33,6 +33,7 @@ ohos_shared_library("windowanimationmanager_napi") {
cflags_cc = [ "-std=c++17" ]
deps = [
"$graphic_2d_root/rosen/modules/animation/window_animation:window_animation",
"$graphic_2d_root/rosen/modules/platform:eventhandler",
"//foundation/graphic/graphic_2d/rosen/modules/animation/window_animation:window_animation",
"//foundation/window/window_manager/utils:libwmutil",

View File

@ -64,16 +64,16 @@ ohos_shared_library("effectkit") {
]
deps = [
"//foundation/arkui/napi:ace_napi",
"//foundation/graphic/graphic_2d/rosen/modules/effect/color_picker:color_picker",
"//foundation/graphic/graphic_2d/rosen/modules/effect/skia_effectChain:skeffectchain",
"//foundation/multimedia/image_framework/interfaces/kits/js/common:image",
]
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"multimedia_image_framework:image",
"multimedia_image_framework:image_native",
"napi:ace_napi",
]
cflags_cc = [ "-std=c++17" ]

View File

@ -53,14 +53,12 @@ ohos_shared_library("color_picker") {
"src/color_picker.cpp",
]
deps = [
"$graphic_2d_root/utils/color_manager:color_manager",
"//foundation/multimedia/image_framework/interfaces/innerkits:image_native",
]
deps = [ "$graphic_2d_root/utils/color_manager:color_manager" ]
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"multimedia_image_framework:image_native",
]
cflags_cc = [ "-std=c++17" ]

View File

@ -46,14 +46,11 @@ config("effect_public_config") {
ohos_shared_library("libeffectchain") {
sources = [ "//third_party/cJSON/cJSON.c" ]
deps = [
"//foundation/multimedia/image_framework/interfaces/innerkits:image_native",
]
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"hitrace:hitrace_meter",
"multimedia_image_framework:image_native",
]
if (effect_enable_gpu) {
@ -76,7 +73,7 @@ ohos_shared_library("libeffectchain") {
"src/vertical_blur_filter.cpp",
]
deps += [ "$graphic_2d_root:libgl" ]
deps = [ "$graphic_2d_root:libgl" ]
}
configs = [ ":effect_config" ]

View File

@ -44,9 +44,6 @@ ohos_shared_library("skeffectchain") {
public_deps = [
"$graphic_2d_root:libsurface",
"$graphic_2d_root/rosen/modules/effect/egl:libegl_effect",
"//commonlibrary/c_utils/base:utils",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter",
"//foundation/multimedia/image_framework/interfaces/kits/js/common:image",
]
if (ace_enable_gpu) {
@ -61,11 +58,14 @@ ohos_shared_library("skeffectchain") {
}
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"hitrace:hitrace_meter",
"init:libbegetutil",
"ipc:ipc_core",
"multimedia_image_framework:image",
"multimedia_image_framework:image_native",
"multimedia_image_framework:pixelconvertadapter",
"napi:ace_napi",
"samgr:samgr_proxy",
]