openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-23 15:10:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

部件化修改

Browse Source 
Change-Id: I26233b2e37f614a23f504a9198b694624f46fad2
Signed-off-by: huangzejia1 <huangzejia1@huawei.com>
This commit is contained in:
huangzejia1 2023-07-11 14:42:44 +08:00
parent e733114a58
commit d5a6311d08
23 changed files with 12 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BUILD.gn
View File

@ -20,7 +20,6 @@ config("ace_config") {
"$ace_root",
"$ace_root/frameworks",
"$root_out_dir/arkui/framework",
"//foundation/graphic/graphcis_2d/rosen/modules/2d_engine/rosen_text/export",
"//third_party/zlib",
]

5
ace_config.gni
View File

@ -77,11 +77,6 @@ ability_runtime_inner_kits_path = "${ability_runtime_path}/interfaces/kits"
ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits"
ability_runtime_napi_path = "${ability_runtime_path}/frameworks/js/napi"
ability_runtime_services_path = "${ability_runtime_path}/services"
barrierfree_accessibility_path = "//foundation/barrierfree/accessibility"
base_inner_kits_path = "//base/account/os_account/interfaces/innerkits"
commonlibrary_utils_path = "//commonlibrary/c_utils"
multimodalinput_inner_kits_path =
"//foundation/multimodalinput/input/interfaces/native/innerkits"
flutter_root = "//third_party/flutter"
ace_flutter_engine_root = "$flutter_root/build"
expat_root = "//third_party/expat"

5
adapter/ohos/entrance/BUILD.gn
View File

@ -79,10 +79,7 @@ template("ace_ohos_standard_source_set") {
"//foundation/arkui/napi/native_engine",
"//foundation/window/window_manager/interfaces/innerkits",
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine",
"//foundation/graphic/graphcis_2d/rosen/modules/2d_engine/rosen_text",
"//foundation/graphic/graphcis_2d/rosen/modules/2d_engine/rosen_text/export",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//third_party/node/src",
]
@ -106,7 +103,6 @@ template("ace_ohos_standard_source_set") {
deps += [
"$ace_root/adapter/ohos/capability:ace_capability_ohos",
"$ace_root/interfaces/inner_api/ace:ace_uicontent",
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text:rosen_text",
"//third_party/zlib:shared_libz",
]
@ -127,6 +123,7 @@ template("ace_ohos_standard_source_set") {
"form_fwk:form_manager",
"graphic_standard:2d_graphics",
"graphic_standard:librender_service_client",
"graphic_standard:rosen_text",
"i18n:intl_util",
"input:libmmi-client",
"ipc:ipc_core",

3
frameworks/core/BUILD.gn
View File

@ -390,7 +390,6 @@ template("ace_core_source_set") {
]
deps += [ "$ace_root/frameworks/core/components_part_upd/foreach:ace_core_components_foreach_part_upd_$platform" ]
deps += [ "//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text:rosen_text" ]
deps += [
"$ace_root/frameworks/core/components_ng/animation:ace_core_components_animation_ng_$platform",
@ -428,6 +427,7 @@ template("ace_core_source_set") {
]
if (is_ohos) {
external_deps += [ "graphic_standard:libtexgine" ]
external_deps += [ "graphic_standard:rosen_text" ]
defines += [ "TEXGINE_SUPPORT_FOR_OHOS" ]
}
if (is_cross_platform_build) {
@ -867,6 +867,7 @@ template("ace_core_ng_source_set") {
]
if (is_ohos) {
external_deps += [ "graphic_standard:libtexgine" ]
external_deps += [ "graphic_standard:rosen_text" ]
defines += [ "TEXGINE_SUPPORT_FOR_OHOS" ]
}
if (is_cross_platform_build) {

2
frameworks/core/components/calendar/BUILD.gn
View File

@ -15,8 +15,6 @@ import(
"//foundation/arkui/ace_engine/frameworks/core/components/components.gni")
build_component("calendar") {
include_dirs =
[ "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include" ]
sources = [
"calendar_component.cpp",
"calendar_data_adapter.cpp",

2
frameworks/core/components/components.gni
View File

@ -56,7 +56,6 @@ template("build_component") {
deps = []
deps += extra_deps
deps += [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
deps += [ "//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text:rosen_text" ]
if (ace_use_new_skia) {
deps += [
@ -132,6 +131,7 @@ template("build_component") {
if (defined(config.enable_rosen_backend) && config.enable_rosen_backend &&
defined(invoker.rosen_sources)) {
sources += invoker.rosen_sources
external_deps += [ "graphic_standard:rosen_text" ]
if (is_cross_platform_build) {
deps += [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client_static" ]
} else {

6
frameworks/core/components_ng/components.gni
View File

@ -96,7 +96,6 @@ template("build_component_ng") {
include_dirs = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine",
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text",
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
@ -144,7 +143,10 @@ template("build_component_ng") {
"//third_party/EGL:libEGL",
"//third_party/openGLES:libGLES",
]
external_deps += [ "graphic_standard:2d_graphics" ]
external_deps += [
"graphic_standard:2d_graphics",
"graphic_standard:rosen_text",
]
} else {
deps += [ "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics_source_$platform" ]
}

8
frameworks/core/components_ng/test/event/gesture_event_hub/BUILD.gn
View File

@ -17,14 +17,6 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("gesture_event_hub_test_ng") {
module_out_path = event_test_output_path
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
"//foundation/graphic/graphic_2d/rosen/modules//2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"//third_party/flutter/skia",
]
sources = [
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",

9
frameworks/core/components_ng/test/pattern/calendar/BUILD.gn
View File

@ -17,14 +17,6 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("calendar_pattern_test_ng") {
module_out_path = pattern_test_output_path
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
"//foundation/graphic/graphic_2d/rosen/modules//2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"//third_party/flutter/skia",
]
sources = [
# animation
"$ace_root/frameworks/base/geometry/least_square_impl.cpp",
@ -166,7 +158,6 @@ ohos_unittest("calendar_pattern_test_ng") {
"$ace_root/frameworks/core/components/theme:build_theme_code",
"$ace_root/test/unittest:ace_unittest_log",
"$cjson_root:cjson_static",
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text:rosen_text",
"//third_party/googletest:gmock_main",
]

7
frameworks/core/components_ng/test/pattern/container_modal/BUILD.gn
View File

@ -16,13 +16,6 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("container_modal_test_ng") {
module_out_path = pattern_test_output_path
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
"//foundation/graphic/graphic_2d/rosen/modules//2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"//third_party/flutter/skia",
]
sources = [
"$ace_root/adapter/preview/osal/ressched_report.cpp",

15
frameworks/core/components_ng/test/pattern/custom_paint/BUILD.gn
View File

@ -17,20 +17,6 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("custom_paint_test_ng") {
module_out_path = pattern_test_output_path
include_dirs = [
"//commonlibrary/c_utils/base/include",
"$ace_root",
"$ace_root/frameworks",
"$skia_root_new",
"$flutter_root/skia",
"$flutter_root/engine",
"$flutter_root/engine/flutter",
"$flutter_root/skia/third_party/externals/harfbuzz/src",
"$ace_graphic/rosen/modules/2d_engine/rosen_text/export",
"$ace_graphic/rosen/modules/2d_graphics/include",
"$ace_graphic/rosen/modules/2d_graphics/src",
"$ace_graphic/rosen/modules/2d_graphics/src/drawing/engine_adapter",
]
sources = [
"canvas_paint_method_test_ng.cpp",
"common_constants.cpp",
@ -45,7 +31,6 @@ ohos_unittest("custom_paint_test_ng") {
"$ace_root/frameworks/core/components_ng/base:ace_core_components_base_ng_ohos",
"$ace_root/test/unittest:ace_engine_unittest_flutter_deps",
"//third_party/googletest:gmock_main",
"//third_party/skia:skia_ohos",
]
if (is_ohos_standard_system) {
deps += [ "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client" ]

8
frameworks/core/components_ng/test/pattern/navigation/BUILD.gn
View File

@ -17,14 +17,6 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("navigation_test_ng") {
module_out_path = pattern_test_output_path
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
"//foundation/graphic/graphic_2d/rosen/modules//2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"//third_party/flutter/skia",
]
sources = [
# custom
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_measure_layout_node.cpp",

8
frameworks/core/components_ng/test/pattern/picker/BUILD.gn
View File

@ -16,14 +16,6 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("date_picker_test_ng") {
module_out_path = pattern_test_output_path
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
"//foundation/graphic/graphic_2d/rosen/modules//2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"//third_party/flutter/skia",
]
sources = [
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",

9
frameworks/core/components_ng/test/pattern/scroll/BUILD.gn
View File

@ -18,15 +18,6 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("scroll_test_ng") {
module_out_path = pattern_test_output_path
include_dirs = [
"//commonlibrary/c_utils/base/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine",
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"//third_party/flutter/skia",
]
sources = [
# special
"$ace_root/frameworks/base/geometry/animatable_dimension.cpp",

8
frameworks/core/components_ng/test/pattern/search/BUILD.gn
View File

@ -17,14 +17,6 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("search_test_ng") {
module_out_path = pattern_test_output_path
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"//third_party/skia",
]
sources = [
"$ace_root/frameworks/core/components_ng/pattern/image/image_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_modifier.cpp",

6
frameworks/core/components_ng/test/pattern/security_component/BUILD.gn
View File

@ -17,12 +17,6 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("security_component_pattern_test_ng") {
module_out_path = pattern_test_output_path
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
]
sources = [
"$ace_root/frameworks/base/utils/time_util.cpp",

7
frameworks/core/components_ng/test/pattern/select_overlay/BUILD.gn
View File

@ -15,13 +15,6 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("select_overlay_test_ng") {
module_out_path = pattern_test_output_path
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
"//foundation/graphic/graphic_2d/rosen/modules//2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"//third_party/flutter/skia",
]
sources = [
"$ace_root/frameworks/base/test/mock/mock_subwindow_manager.cpp",

8
frameworks/core/components_ng/test/pattern/text/BUILD.gn
View File

@ -17,14 +17,6 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("text_test_ng") {
module_out_path = pattern_test_output_path
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
"//foundation/graphic/graphic_2d/rosen/modules//2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"//third_party/flutter/build/skia",
]
sources = [
"$ace_root/adapter/preview/osal/ressched_report.cpp",
"$ace_root/frameworks/base/geometry/dimension.cpp",

7
frameworks/core/components_ng/test/pattern/textfield/BUILD.gn
View File

@ -16,13 +16,6 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("textfield_test_ng") {
module_out_path = pattern_test_output_path
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
"//foundation/graphic/graphic_2d/rosen/modules//2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"//third_party/flutter/skia",
]
sources = [
"$ace_root/frameworks/base/geometry/animatable_dimension.cpp",

7
frameworks/core/components_ng/test/property/grid_property/BUILD.gn
View File

@ -15,13 +15,6 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("grid_property_test_ng") {
module_out_path = property_test_output_path
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
"//foundation/graphic/graphic_2d/rosen/modules//2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"//third_party/flutter/skia",
]
sources = [
"$ace_root/frameworks/base/geometry/dimension.cpp",

8
test/unittest/BUILD.gn
View File

@ -43,10 +43,10 @@ config("ace_unittest_config") {
"$ace_root",
"$ace_root/frameworks",
"$root_out_dir/arkui/framework",
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"$ace_graphic/rosen/modules/2d_engine/rosen_text/export",
"$ace_graphic/rosen/modules/2d_graphics/include",
"$ace_graphic/rosen/modules/2d_graphics/src",
"$ace_graphic/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"//third_party/skia",
"//third_party/flutter/build/skia",
]

7
test/unittest/core/base/view_abstract/BUILD.gn
View File

@ -16,13 +16,6 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("view_abstract_test_ng") {
module_out_path = base_test_output_path
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
"//foundation/graphic/graphic_2d/rosen/modules//2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
"//third_party/flutter/skia",
]
sources = [
"$ace_root/frameworks/base/geometry/dimension.cpp",

6
test/unittest/core/pipeline/BUILD.gn
View File

@ -16,12 +16,6 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("pipeline_context_test_ng") {
module_out_path = "$basic_test_output_path/pipeline"
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
]
sources = [
# animation