From 039fc99b474fd7bdb428f9d0bc485bcaf6241d71 Mon Sep 17 00:00:00 2001 From: kangchongtao Date: Wed, 30 Oct 2024 07:48:35 +0000 Subject: [PATCH] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: kangchongtao Change-Id: I7416a99177835f553720c618eb9d141c3edab913 --- adapter/ohos/entrance/pa_engine/pa_backend.h | 2 +- adapter/ohos/services/etc/BUILD.gn | 1 + advanced_ui_component/navpushpathhelper/BUILD.gn | 2 +- .../bridge/cj_frontend/interfaces/cj_ffi/cj_image_ffi.cpp | 2 +- .../interfaces/cj_ffi/cj_interactable_view_ffi.cpp | 2 +- .../interfaces/cj_ffi/cj_richeditor_controller_ffi.cpp | 4 +++- .../bridge/cj_frontend/interfaces/cj_ffi/cj_shape_ffi.cpp | 2 +- frameworks/bridge/declarative_frontend/BUILD.gn | 8 +++++++- .../bridge/declarative_frontend/engine/jsi/BUILD.gn | 5 +++-- frameworks/core/common/font_manager.cpp | 4 ++-- frameworks/core/components/font/constants_converter.h | 2 +- frameworks/core/components/text_field/render_text_field.h | 2 +- frameworks/core/components/web/resource/web_delegate.cpp | 5 +++-- .../core/components/xcomponent/xcomponent_element.h | 4 ++-- .../pattern/rich_editor/rich_editor_pattern.cpp | 2 +- .../pattern/rich_editor/rich_editor_pattern.h | 2 +- .../components_ng/pattern/text_field/text_field_pattern.h | 2 +- .../inner_api/drawable_descriptor/drawable_descriptor.cpp | 2 +- interfaces/napi/kits/animator/animator_option.h | 1 - interfaces/napi/kits/drag_controller/drag_preview.h | 2 +- .../napi/kits/drag_controller/js_drag_controller.cpp | 2 +- 21 files changed, 34 insertions(+), 24 deletions(-) diff --git a/adapter/ohos/entrance/pa_engine/pa_backend.h b/adapter/ohos/entrance/pa_engine/pa_backend.h index 0d28f0e2e95..8ae89a5dd0d 100644 --- a/adapter/ohos/entrance/pa_engine/pa_backend.h +++ b/adapter/ohos/entrance/pa_engine/pa_backend.h @@ -41,7 +41,7 @@ class PaBackend : public Backend { public: PaBackend() = default; - ~PaBackend() override; + ~PaBackend() noexcept override; bool Initialize(BackendType type, SrcLanguage language) override; diff --git a/adapter/ohos/services/etc/BUILD.gn b/adapter/ohos/services/etc/BUILD.gn index 5f493c96dfc..d667e2cfaea 100644 --- a/adapter/ohos/services/etc/BUILD.gn +++ b/adapter/ohos/services/etc/BUILD.gn @@ -16,5 +16,6 @@ import("//build/ohos.gni") ohos_prebuilt_etc("ohos.para.dac") { source = "//foundation/arkui/ace_engine/adapter/ohos/services/etc/ace_engine.para.dac" part_name = "ace_engine" + subsystem_name = "arkui" module_install_dir = "etc/param" } diff --git a/advanced_ui_component/navpushpathhelper/BUILD.gn b/advanced_ui_component/navpushpathhelper/BUILD.gn index 856103c64ae..2d61a1cc0d5 100644 --- a/advanced_ui_component/navpushpathhelper/BUILD.gn +++ b/advanced_ui_component/navpushpathhelper/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni") +import("//build/config/components/ets_frontend/es2abc_config.gni") import("//build/ohos.gni") import("//foundation/arkui/ace_engine/ace_config.gni") import("//foundation/arkui/ace_engine/adapter/preview/build/config.gni") diff --git a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_image_ffi.cpp b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_image_ffi.cpp index 1102d6e6502..f07cdde0364 100644 --- a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_image_ffi.cpp +++ b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_image_ffi.cpp @@ -16,7 +16,7 @@ #include "bridge/cj_frontend/interfaces/cj_ffi/cj_image_ffi.h" #ifndef __NON_OHOS__ -#include "foundation/multimedia/image_framework/frameworks/kits/cj/include/pixel_map_impl.h" +#include "pixel_map_impl.h" #endif #include "cj_lambda.h" #include "core/components_ng/pattern/image/image_model_ng.h" diff --git a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_interactable_view_ffi.cpp b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_interactable_view_ffi.cpp index 9a60eacd058..cb42b55e1e3 100644 --- a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_interactable_view_ffi.cpp +++ b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_interactable_view_ffi.cpp @@ -20,7 +20,7 @@ #include "core/components_ng/base/view_abstract_model_ng.h" #include "core/components_ng/base/view_stack_model.h" #ifndef _NON_OHOS_ -#include "foundation/multimedia/image_framework/frameworks/kits/cj/include/pixel_map_impl.h" +#include "pixel_map_impl.h" #include "adapter/ohos/osal/pixel_map_ohos.h" #endif diff --git a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_richeditor_controller_ffi.cpp b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_richeditor_controller_ffi.cpp index 1f0816b2e1b..740abe6c6a3 100644 --- a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_richeditor_controller_ffi.cpp +++ b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_richeditor_controller_ffi.cpp @@ -13,8 +13,10 @@ * limitations under the License. */ -#include "foundation/multimedia/image_framework/frameworks/kits/cj/include/pixel_map_impl.h" #include "bridge/cj_frontend/interfaces/cj_ffi/cj_richeditor_controller_ffi.h" + +#include "pixel_map_impl.h" + #include "bridge/common/utils/utils.h" using namespace OHOS::Ace; diff --git a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_shape_ffi.cpp b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_shape_ffi.cpp index 2a7a3a99f04..1957a8b0239 100644 --- a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_shape_ffi.cpp +++ b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_shape_ffi.cpp @@ -23,7 +23,7 @@ #include "core/components_ng/pattern/shape/shape_model_ng.h" #ifndef _NON_OHOS_ -#include "foundation/multimedia/image_framework/frameworks/kits/cj/include/pixel_map_impl.h" +#include "pixel_map_impl.h" #endif using namespace OHOS::Ace; diff --git a/frameworks/bridge/declarative_frontend/BUILD.gn b/frameworks/bridge/declarative_frontend/BUILD.gn index 6a21c53f821..bd176c3149e 100644 --- a/frameworks/bridge/declarative_frontend/BUILD.gn +++ b/frameworks/bridge/declarative_frontend/BUILD.gn @@ -640,13 +640,17 @@ template("declarative_js_engine") { # add for cross_platfrom_build temporarily, shall be removed after external_deps is supported if (is_arkui_x) { configs += [ "$ark_ets_path:ark_jsruntime_public_config" ] - deps += [ "$ark_ets_path:libark_jsruntime_static" ] + deps += [ + "$ace_graphic/rosen/modules/render_service_base:librender_service_base_static", + "$ark_ets_path:libark_jsruntime_static", + ] if (defined(config.pixel_map_support) && config.pixel_map_support) { configs += [ "//foundation/multimedia/image_framework/interfaces/innerkits:image_external_config" ] } } else { external_deps += [ "ets_runtime:libark_jsruntime", + "graphic_2d:librender_service_base", "napi:ace_napi", ] } @@ -1068,6 +1072,7 @@ template("declarative_js_engine_ng") { ] configs += [ "$ark_ets_path:ark_jsruntime_public_config" ] deps += [ + "$ace_graphic/rosen/modules/render_service_base:librender_service_base_static", "$ark_ets_path:libark_jsruntime_static", "//foundation/graphic/graphic_2d/interfaces/kits/napi/graphic/drawing:drawing_napi_impl", ] @@ -1077,6 +1082,7 @@ template("declarative_js_engine_ng") { } else { external_deps += [ "ets_runtime:libark_jsruntime", + "graphic_2d:librender_service_base", "napi:ace_napi", ] } diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn b/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn index 195a618bbee..7d6a75a2cb7 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn +++ b/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn @@ -86,7 +86,7 @@ es2abc_gen_abc("gen_arkComponent_abc") { out_puts = [ base_output_path + "/arkComponent.abc" ] } -if (!is_arkui_x) { +if (!is_arkui_x && (use_mac || use_mingw_win || use_linux)) { es2abc_gen_abc("gen_js_mock_system_plugin_abc") { extra_visibility = [ ":*" ] # Only targets in this file can depend on this. src_js = rebase_path( @@ -155,7 +155,7 @@ gen_obj("abc_ark_component") { snapshot_dep = [ ":gen_arkComponent_abc" ] } -if (!is_arkui_x) { +if (!is_arkui_x && (use_mac || use_mingw_win || use_linux)) { gen_obj("abc_mock_system_plugin") { input = base_output_path + "/jsMockSystemPlugin.abc" if (use_mac || use_mingw_win || use_linux) { @@ -177,6 +177,7 @@ foreach(item, abc_sources) { ohos_prebuilt_etc("copy_" + item + "_abc") { source = base_output_path + "/" + item + ".abc" deps = [ ":gen_" + item + "_abc" ] + subsystem_name = ace_engine_subsystem part_name = ace_engine_part module_install_dir = "etc/abc/framework" } diff --git a/frameworks/core/common/font_manager.cpp b/frameworks/core/common/font_manager.cpp index 6aea6c22d9a..413f9f906b8 100644 --- a/frameworks/core/common/font_manager.cpp +++ b/frameworks/core/common/font_manager.cpp @@ -20,8 +20,8 @@ #include "core/components_ng/base/frame_node.h" #ifdef ENABLE_ROSEN_BACKEND #ifdef TEXGINE_SUPPORT_FOR_OHOS -#include "foundation/graphic/graphic_2d/rosen/modules/texgine/src/font_config.h" -#include "foundation/graphic/graphic_2d/rosen/modules/texgine/src/font_parser.h" +#include "texgine/src/font_config.h" +#include "texgine/src/font_parser.h" #endif #endif #ifdef USE_PLATFORM_FONT diff --git a/frameworks/core/components/font/constants_converter.h b/frameworks/core/components/font/constants_converter.h index e9b37e39740..cc80a5be4d9 100644 --- a/frameworks/core/components/font/constants_converter.h +++ b/frameworks/core/components/font/constants_converter.h @@ -24,7 +24,7 @@ #include "include/core/SkColor.h" #else #include "rosen_text/typography_types.h" -#include "third_party/skia/include/core/SkColor.h" +#include "SkColor.h" #endif #include "core/components/common/properties/text_style.h" diff --git a/frameworks/core/components/text_field/render_text_field.h b/frameworks/core/components/text_field/render_text_field.h index a892dd67873..fd44588ada1 100644 --- a/frameworks/core/components/text_field/render_text_field.h +++ b/frameworks/core/components/text_field/render_text_field.h @@ -45,7 +45,7 @@ #include "core/pipeline/base/render_node.h" #if defined(ENABLE_STANDARD_INPUT) -#include "commonlibrary/c_utils/base/include/refbase.h" +#include "refbase.h" namespace OHOS::MiscServices { class OnTextChangedListener; diff --git a/frameworks/core/components/web/resource/web_delegate.cpp b/frameworks/core/components/web/resource/web_delegate.cpp index cf1dfdee115..664a2670731 100644 --- a/frameworks/core/components/web/resource/web_delegate.cpp +++ b/frameworks/core/components/web/resource/web_delegate.cpp @@ -21,13 +21,14 @@ #include #include +#include "event_handler.h" + #include "adapter/ohos/entrance/ace_container.h" #include "adapter/ohos/entrance/utils.h" #include "base/json/json_util.h" #include "base/log/ace_trace.h" #include "base/log/log.h" #include "base/memory/referenced.h" -#include "base/notification/eventhandler/interfaces/inner_api/event_handler.h" #include "base/ressched/ressched_report.h" #include "base/utils/utils.h" #include "base/perfmonitor/perf_monitor.h" @@ -47,7 +48,7 @@ #include "parameters.h" #include "screen_manager/screen_types.h" #include "system_ability_definition.h" -#include "third_party/icu/icu4c/source/common/unicode/ucnv.h" +#include "unicode/ucnv.h" #include "transaction/rs_interfaces.h" #include "web_configuration_observer.h" #include "web_javascript_execute_callback.h" diff --git a/frameworks/core/components/xcomponent/xcomponent_element.h b/frameworks/core/components/xcomponent/xcomponent_element.h index b2eeb8f295d..792e5115390 100644 --- a/frameworks/core/components/xcomponent/xcomponent_element.h +++ b/frameworks/core/components/xcomponent/xcomponent_element.h @@ -23,8 +23,8 @@ #ifdef OHOS_STANDARD_SYSTEM #include "display_type.h" -#include "foundation/graphic/graphic_surface/interfaces/inner_api/surface/window.h" -#include "foundation/window/window_manager/interfaces/innerkits/wm/window.h" +#include "surface/window.h" +#include "wm/window.h" #include "render_service_client/core/ui/rs_node.h" #include "render_service_client/core/ui/rs_surface_node.h" #include "surface_delegate.h" diff --git a/frameworks/core/components_ng/pattern/rich_editor/rich_editor_pattern.cpp b/frameworks/core/components_ng/pattern/rich_editor/rich_editor_pattern.cpp index 4daaf77ad35..7b59983be64 100644 --- a/frameworks/core/components_ng/pattern/rich_editor/rich_editor_pattern.cpp +++ b/frameworks/core/components_ng/pattern/rich_editor/rich_editor_pattern.cpp @@ -62,7 +62,7 @@ #ifndef ACE_UNITTEST #ifdef ENABLE_STANDARD_INPUT -#include "commonlibrary/c_utils/base/include/refbase.h" +#include "refbase.h" #include "core/components_ng/pattern/text_field/on_text_changed_listener_impl.h" #endif diff --git a/frameworks/core/components_ng/pattern/rich_editor/rich_editor_pattern.h b/frameworks/core/components_ng/pattern/rich_editor/rich_editor_pattern.h index 627420e0465..52f77d859fb 100644 --- a/frameworks/core/components_ng/pattern/rich_editor/rich_editor_pattern.h +++ b/frameworks/core/components_ng/pattern/rich_editor/rich_editor_pattern.h @@ -57,7 +57,7 @@ #ifndef ACE_UNITTEST #ifdef ENABLE_STANDARD_INPUT -#include "commonlibrary/c_utils/base/include/refbase.h" +#include "refbase.h" namespace OHOS::MiscServices { class OnTextChangedListener; diff --git a/frameworks/core/components_ng/pattern/text_field/text_field_pattern.h b/frameworks/core/components_ng/pattern/text_field/text_field_pattern.h index ba06db49cee..6c613cc8c0f 100644 --- a/frameworks/core/components_ng/pattern/text_field/text_field_pattern.h +++ b/frameworks/core/components_ng/pattern/text_field/text_field_pattern.h @@ -76,7 +76,7 @@ #ifndef ACE_UNITTEST #ifdef ENABLE_STANDARD_INPUT -#include "commonlibrary/c_utils/base/include/refbase.h" +#include "refbase.h" namespace OHOS::MiscServices { class InspectorFilter; diff --git a/interfaces/inner_api/drawable_descriptor/drawable_descriptor.cpp b/interfaces/inner_api/drawable_descriptor/drawable_descriptor.cpp index 1956152cc6a..10870dd6304 100644 --- a/interfaces/inner_api/drawable_descriptor/drawable_descriptor.cpp +++ b/interfaces/inner_api/drawable_descriptor/drawable_descriptor.cpp @@ -21,7 +21,7 @@ #include #include "drawable_descriptor.h" -#include "third_party/cJSON/cJSON.h" +#include "cJSON.h" #ifndef PREVIEW #include "image_source.h" #endif diff --git a/interfaces/napi/kits/animator/animator_option.h b/interfaces/napi/kits/animator/animator_option.h index 1510d49b0e1..f1e5ec99b20 100644 --- a/interfaces/napi/kits/animator/animator_option.h +++ b/interfaces/napi/kits/animator/animator_option.h @@ -21,7 +21,6 @@ #include #include "napi/native_api.h" -#include "napi/native_engine/native_value.h" #include "napi/native_node_api.h" #include "base/memory/referenced.h" diff --git a/interfaces/napi/kits/drag_controller/drag_preview.h b/interfaces/napi/kits/drag_controller/drag_preview.h index 20b5ac9a463..ccb98515a3f 100644 --- a/interfaces/napi/kits/drag_controller/drag_preview.h +++ b/interfaces/napi/kits/drag_controller/drag_preview.h @@ -24,9 +24,9 @@ #include "native_engine/impl/ark/ark_native_engine.h" #include "native_value.h" #include "node_api.h" +#include "interaction_manager.h" #include "base/log/log_wrapper.h" -#include "base/msdp/device_status/interfaces/innerkits/interaction/include/interaction_manager.h" #include "bridge/common/utils/utils.h" #include "core/common/ace_engine.h" #include "frameworks/core/components/common/properties/color.h" diff --git a/interfaces/napi/kits/drag_controller/js_drag_controller.cpp b/interfaces/napi/kits/drag_controller/js_drag_controller.cpp index 6e91feefd2a..1e337da067b 100644 --- a/interfaces/napi/kits/drag_controller/js_drag_controller.cpp +++ b/interfaces/napi/kits/drag_controller/js_drag_controller.cpp @@ -29,11 +29,11 @@ #include "jsnapi.h" #include "pixel_map.h" #include "pixel_map_napi.h" +#include "interaction_manager.h" #include "adapter/ohos/capability/interaction/start_drag_listener_impl.h" #include "base/log/log_wrapper.h" #include "base/memory/referenced.h" -#include "base/msdp/device_status/interfaces/innerkits/interaction/include/interaction_manager.h" #include "base/utils/utils.h" #include "bridge/common/utils/utils.h" #include "bridge/declarative_frontend/engine/functions/js_drag_function.h"