openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-27 09:12:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

编译规范整改

Browse Source 
Signed-off-by: kangchongtao <kangchongtao@huawei.com>
This commit is contained in:
kangchongtao 2023-06-25 10:13:09 +08:00
parent 4f2388ecae
commit d32d9d1b1a
18 changed files with 64 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
adapter/ohos/entrance/pa_engine/engine/jsi/BUILD.gn
View File

@ -57,13 +57,14 @@ template("js_pa_engine_ark") {
"$ability_runtime_napi_path/inner/napi_common",
"//foundation/arkui/ace_engine/adapter/ohos/entrance/pa_engine/engine/common",
]
deps = [ "$ability_runtime_napi_path/inner/napi_ability_common:napi_ability_common" ]
deps = []
external_deps = [
"ability_base:want",
"ability_base:zuri",
"ability_runtime:abilitykit_native",
"ability_runtime:appkit_native",
"ability_runtime:js_environment",
"ability_runtime:napi_ability_common",
"ability_runtime:napi_common",
"ability_runtime:runtime",
"bundle_framework:appexecfwk_base",

7
bundle.json
View File

@ -63,19 +63,22 @@
"data_share",
"resource_management",
"i18n",
"hitrace_native",
"hicollie",
"init",
"multimedia_image_framework",
"accessibility",
"frame_aware_sched",
"hicollie_native",
"hitrace_native",
"camera_framework",
"player_framework",
"access_token",
"hilog_native",
"2d_graphics",
"librender_service_client",
"input",
"power_manager",
"webview",
"imf",
"device_status"
],
"third_party": [

10
frameworks/bridge/declarative_frontend/BUILD.gn
View File

@ -527,7 +527,10 @@ template("declarative_js_engine") {
configs += [ "//foundation/multimedia/image_framework/interfaces/innerkits:image_external_config" ]
}
} else {
external_deps += [ "ets_runtime:libark_jsruntime" ]
external_deps += [
"ets_runtime:libark_jsruntime",
"napi:ace_napi",
]
}
if (platform == "windows" || platform == "mac" || platform == "linux") {
@ -812,7 +815,10 @@ template("declarative_js_engine_ng") {
configs += [ "//foundation/multimedia/image_framework/interfaces/innerkits:image_external_config" ]
}
} else {
external_deps += [ "ets_runtime:libark_jsruntime" ]
external_deps += [
"ets_runtime:libark_jsruntime",
"napi:ace_napi",
]
}
deps += [ "engine/$engine_path:declarative_js_engine_bridge_${engine_name}_$platform" ]

15
frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn
View File

@ -167,11 +167,20 @@ template("declarative_js_engine_ark") {
if (is_cross_platform_build) {
configs += [ "$ark_ets_path:ark_jsruntime_public_config" ]
deps += [ "$ark_ets_path:libark_jsruntime_static" ]
public_deps = [ "//foundation/arkui/napi:ace_napi" ]
} else {
external_deps += [ "ets_runtime:libark_jsruntime" ]
external_deps += [
"ets_runtime:libark_jsruntime",
"napi:ace_napi",
"napi:ace_napi_ark",
]
}
deps = []
if (is_cross_platform_build) {
deps += [ "//foundation/arkui/napi:ace_napi_ark" ]
}
if (defined(config.build_for_preview) && config.build_for_preview) {
deps += [ ":gen_obj_src_abc_mock_system_plugin" ]
sources += [ "utils/jsi_module_searcher.cpp" ]
@ -193,10 +202,6 @@ template("declarative_js_engine_ark") {
]
}
# if napi support
deps += [ "//foundation/arkui/napi:ace_napi_ark" ]
public_deps = [ "//foundation/arkui/napi:ace_napi" ]
deps += [
":gen_obj_src_abc_enum_style",
":gen_obj_src_abc_proxyclass",

3
frameworks/core/components/camera/BUILD.gn
View File

@ -44,11 +44,10 @@ build_component("camera") {
sources += [ "standard_system/camera.cpp" ]
deps = [ "//foundation/graphic/graphic_2d:libsurface" ]
external_deps = [
"c_utils:utils",
"camera_framework:camera_framework",
"graphic_standard:surface",
"ipc:ipc_core",
"player_framework:media_client",
]

8
frameworks/core/components/form/BUILD.gn
View File

@ -32,23 +32,19 @@ build_component("form") {
external_deps = [
"ability_base:want",
"ability_runtime:app_manager",
"ace_engine:ace_form_render",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"form_fwk:fmskit_native",
"form_fwk:form_manager",
"graphic_standard:librender_service_client",
"graphic_standard:surface",
"input:libmmi-client",
"ipc:ipc_core",
]
include_dirs = [
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
"//foundation/arkui/ace_engine/interfaces/inner_api/form_render/include",
]
deps = [
"//foundation/arkui/ace_engine/interfaces/inner_api/form_render:ace_form_render",
"//foundation/graphic/graphic_2d:libsurface",
]
deps = [ "//foundation/arkui/ace_engine/interfaces/inner_api/form_render:ace_form_render" ]
}
if (ace_use_new_skia) {
sources -= [ "flutter_render_form.cpp" ]

14
frameworks/core/components/plugin/BUILD.gn
View File

@ -41,22 +41,20 @@ build_component("plugin") {
"//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
]
deps = [
"$ability_runtime_inner_api_path/ability_manager:ability_manager",
"$ability_runtime_path/frameworks/native/ability/native:abilitykit_native",
"//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/window/window_manager/wm:libwm",
]
deps = [ "//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr" ]
external_deps = [
"ability_base:extractortool",
"ability_base:want",
"ability_runtime:ability_manager",
"ability_runtime:abilitykit_native",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"input:libmmi-client",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libwm",
]
if (os_account_exists) {

7
frameworks/core/components/remote_window/BUILD.gn
View File

@ -30,8 +30,9 @@ build_component("remote_window") {
"//foundation/multimedia/player_framework/interfaces/inner_api/native",
]
deps = [ "//foundation/graphic/graphic_2d:libsurface" ]
external_deps = [ "ipc:ipc_core" ]
external_deps = [
"graphic_standard:surface",
"ipc:ipc_core",
]
}
}

7
frameworks/core/components/text_overlay/BUILD.gn
View File

@ -54,18 +54,19 @@ build_component("text_overlay_for_web") {
if (!ace_use_new_skia) {
sources += [ "flutter_render_text_overlay.cpp" ]
}
external_deps = []
if (is_ohos_standard_system) {
deps = [
"//foundation/graphic/graphic_2d:libsurface",
"//third_party/EGL:libEGL",
"//third_party/openGLES:libGLES",
]
external_deps += [ "graphic_standard:surface" ]
}
rosen_sources = [ "rosen_render_text_overlay.cpp" ]
standard_web_configs = [ ":ohos_text_overlay_web_config" ]
standard_web_deps = [ "webview:libnweb" ]
external_deps = [ "ability_runtime:app_manager" ]
external_deps += [ "ability_runtime:app_manager" ]
}

7
frameworks/core/components/web/BUILD.gn
View File

@ -52,10 +52,6 @@ build_component("web") {
if (is_ohos_standard_system) {
configs = [ ":ohos_web_config" ]
deps = [
"$ability_runtime_path/frameworks/native/appkit:appkit_native",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/window/window_manager/utils:libwmutil",
"//foundation/window/window_manager/wm:libwm",
"//third_party/EGL:libEGL",
"//third_party/openGLES:libGLES",
]
@ -63,10 +59,13 @@ build_component("web") {
"ability_base:base",
"ability_base:configuration",
"ability_runtime:app_manager",
"ability_runtime:appkit_native",
"c_utils:utils",
"graphic_standard:surface",
"init:libbegetutil",
"ipc:ipc_core",
"webview:libnweb",
"window_manager:libwm",
]
}
}

7
frameworks/core/components/xcomponent/BUILD.gn
View File

@ -38,14 +38,9 @@ build_component("xcomponent") {
"//foundation/graphic/graphic_2d/interfaces/innerkits/wm",
"//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
]
deps = [
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/window/window_manager/utils:libwmutil",
]
external_deps = [
"graphic_standard:librender_service_client",
"graphic_standard:surface",
"ipc:ipc_core",
"window_manager:libwm",
]

1
frameworks/core/components_ng/pattern/web/BUILD.gn
View File

@ -41,7 +41,6 @@ build_component_ng("web_pattern_ng") {
if (is_ohos_standard_system) {
configs = [ ":ohos_web_config" ]
configs += [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:render_service_client_config" ]
deps = [ "//foundation/window/window_manager/utils:libwmutil" ]
external_deps = [
"ability_base:base",
"ability_base:configuration",

4
frameworks/core/components_ng/pattern/window_scene/BUILD.gn
View File

@ -40,11 +40,9 @@ build_component_ng("window_scene") {
if (is_ohos_standard_system) {
configs = [ ":window_scene_config" ]
deps = [ "$graphic_standard_path/rosen/modules/render_service_client:librender_service_client" ]
external_deps = [
"ability_runtime:abilitykit_native",
"graphic_standard:librender_service_client",
"input:libmmi-client",
"ipc:ipc_single",
"power_manager:powermgr_client",

2
frameworks/core/components_v2/ability_component/BUILD.gn
View File

@ -25,6 +25,6 @@ build_component("ability_v2") {
rosen_sources = [ "rosen_render_ability_component.cpp" ]
if (is_ohos_standard_system && !use_mingw_win && !use_mac) {
deps = [ "//foundation/graphic/graphic_2d:libsurface" ]
external_deps = [ "graphic_standard:surface" ]
}
}

6
frameworks/core/pipeline/BUILD.gn
View File

@ -19,6 +19,8 @@ template("ace_core_pipeline_source_set") {
forward_variables_from(invoker, "*")
ohos_source_set(target_name) {
subsystem_name = ace_engine_subsystem
part_name = ace_engine_part
if (current_os == "ohos") {
sanitize = {
integer_overflow = true
@ -77,7 +79,7 @@ template("ace_core_pipeline_source_set") {
configs = [ "$ace_root:ace_config" ]
deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
external_deps = []
if (ace_use_new_skia) {
deps += [
"$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform",
@ -96,7 +98,7 @@ template("ace_core_pipeline_source_set") {
if (is_cross_platform_build) {
deps += [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client_static" ]
} else {
deps += [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client" ]
external_deps += [ "graphic_standard:librender_service_client" ]
}
}

6
frameworks/core/pipeline_ng/BUILD.gn
View File

@ -20,6 +20,8 @@ template("ace_core_pipeline_ng_source_set") {
forward_variables_from(invoker, "*")
ohos_source_set(target_name) {
subsystem_name = ace_engine_subsystem
part_name = ace_engine_part
if (current_os == "ohos") {
sanitize = {
integer_overflow = true
@ -42,7 +44,7 @@ template("ace_core_pipeline_ng_source_set") {
configs = [ "$ace_root:ace_config" ]
deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
external_deps = []
if (ace_use_new_skia) {
deps += [
"$ace_flutter_engine_root/libtxt:thirdparty_lib_txt_$platform",
@ -60,7 +62,7 @@ template("ace_core_pipeline_ng_source_set") {
if (is_cross_platform_build) {
deps += [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client_static" ]
} else {
deps += [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client" ]
external_deps += [ "graphic_standard:librender_service_client" ]
}
deps += [ "$ace_root/frameworks/core/components_ng/render:ace_core_components_render_ng_$platform" ]

7
interfaces/inner_api/drawable_descriptor/BUILD.gn
View File

@ -57,12 +57,9 @@ ohos_shared_library("drawable_descriptor") {
deps += [ "$ace_flutter_engine_root/skia:ace_skia_ohos" ]
}
public_deps = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
]
external_deps = [
"graphic_standard:2d_graphics",
"graphic_standard:librender_service_client",
"multimedia_image_framework:image",
"multimedia_image_framework:image_native",
"napi:ace_napi",

7
interfaces/napi/kits/drawabledescriptor/BUILD.gn
View File

@ -19,8 +19,13 @@ ohos_shared_library("drawabledescriptor") {
sources = [ "drawable_register.cpp" ]
deps = [
"$ace_root/interfaces/inner_api/drawable_descriptor:drawable_descriptor",
]
external_deps = [
"ace_engine:drawable_descriptor",
"graphic_standard:2d_graphics",
"graphic_standard:librender_service_client",
"hiviewdfx_hilog_native:libhilog",
"multimedia_image_framework:image",
"multimedia_image_framework:image_native",