From cbd5c07a40f80e399df1dbc4477fbce7088d1b7d Mon Sep 17 00:00:00 2001 From: z00932658 Date: Sat, 7 Jun 2025 19:04:15 +0800 Subject: [PATCH 1/2] Fix isHybrid for arkui_ace_engine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/ICI82G Signed-off-by: zhushihao 是否涉及非兼容变更: 否 TDD自验结果(如有失败用例需提供基线执行情况): 不涉及 XTS自验结果(如有失败用例需提供基线执行情况): 不涉及 --- adapter/preview/entrance/ace_preview_helper.h | 2 +- .../declarative_frontend/engine/jsi/jsi_declarative_engine.cpp | 2 +- .../declarative_frontend/engine/jsi/jsi_declarative_engine.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adapter/preview/entrance/ace_preview_helper.h b/adapter/preview/entrance/ace_preview_helper.h index 496f77b687a..bb169714409 100644 --- a/adapter/preview/entrance/ace_preview_helper.h +++ b/adapter/preview/entrance/ace_preview_helper.h @@ -24,7 +24,7 @@ namespace OHOS::Ace::Platform { using CallbackTypeIsCurrentRunnerThread = std::function; using CallbackTypePostTask = std::function&, int64_t)>; -using CallbackTypeHspBufferTracker = std::function; +using CallbackTypeHspBufferTracker = std::function; using CallbackTypeSetClipboardData = std::function; using CallbackTypeGetClipboardData = std::function; using CallbackFlushEmpty = std::function; diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp index fd0a9847aa0..2a6976ee128 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp +++ b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp @@ -2136,7 +2136,7 @@ bool JsiDeclarativeEngine::ExecuteJsForFastPreview(const std::string& jsCode, co } void JsiDeclarativeEngine::SetHspBufferTrackerCallback( - std::function&& callback) + std::function&& callback) { CHECK_NULL_VOID(engineInstance_); auto runtime = std::static_pointer_cast(engineInstance_->GetJsRuntime()); diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.h b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.h index 6ec9998c05c..f1bb54b835a 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.h +++ b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.h @@ -455,7 +455,7 @@ public: } // Support the hsp on the previewer void SetHspBufferTrackerCallback( - std::function&& callback); + std::function&& callback); // Support to execute the ets code mocked by developer void SetMockModuleList(const std::map& mockJsonInfo); bool IsComponentPreview() override; -- Gitee From 0451e1e8f80ff9a06272c4dfdc007835765f444f Mon Sep 17 00:00:00 2001 From: MockMockBlack Date: Thu, 26 Jun 2025 10:50:36 +0800 Subject: [PATCH 2/2] Reapply "add build test case for C api" This reverts commit 058b0b5d72c3cd5d864b7a43c00652252fe62016. Signed-off-by: MockMockBlack --- interfaces/native/BUILD.gn | 2 ++ interfaces/native/build_check_for_c.c | 29 +++++++++++++++++++++++ interfaces/native/build_check_for_cpp.cpp | 29 +++++++++++++++++++++++ interfaces/native/drag_and_drop.h | 2 +- interfaces/native/ui_input_event.h | 1 + 5 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 interfaces/native/build_check_for_c.c create mode 100644 interfaces/native/build_check_for_cpp.cpp diff --git a/interfaces/native/BUILD.gn b/interfaces/native/BUILD.gn index d51442db948..37c7012f57b 100644 --- a/interfaces/native/BUILD.gn +++ b/interfaces/native/BUILD.gn @@ -57,6 +57,8 @@ ohos_shared_library("ace_ndk") { "//foundation/arkui/ace_engine/frameworks/core/components/common/properties/color.cpp", "//foundation/arkui/ace_engine/frameworks/core/components/xcomponent/native_interface_xcomponent_impl.cpp", "//foundation/arkui/ace_engine/frameworks/core/components_v2/inspector/inspector_constants.cpp", + "build_check_for_c.c", + "build_check_for_cpp.cpp", "event/drag_and_drop_impl.cpp", "event/key_event_impl.cpp", "event/ui_input_event.cpp", diff --git a/interfaces/native/build_check_for_c.c b/interfaces/native/build_check_for_c.c new file mode 100644 index 00000000000..ef62c948eba --- /dev/null +++ b/interfaces/native/build_check_for_c.c @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "drag_and_drop.h" +#include "drawable_descriptor.h" +#include "native_animate.h" +#include "native_dialog.h" +#include "native_gesture.h" +#include "native_interface.h" +#include "native_interface_accessibility.h" +#include "native_interface_xcomponent.h" +#include "native_key_event.h" +#include "native_node.h" +#include "native_node_napi.h" +#include "native_type.h" +#include "native_xcomponent_key_event.h" +#include "ui_input_event.h" diff --git a/interfaces/native/build_check_for_cpp.cpp b/interfaces/native/build_check_for_cpp.cpp new file mode 100644 index 00000000000..ef62c948eba --- /dev/null +++ b/interfaces/native/build_check_for_cpp.cpp @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "drag_and_drop.h" +#include "drawable_descriptor.h" +#include "native_animate.h" +#include "native_dialog.h" +#include "native_gesture.h" +#include "native_interface.h" +#include "native_interface_accessibility.h" +#include "native_interface_xcomponent.h" +#include "native_key_event.h" +#include "native_node.h" +#include "native_node_napi.h" +#include "native_type.h" +#include "native_xcomponent_key_event.h" +#include "ui_input_event.h" diff --git a/interfaces/native/drag_and_drop.h b/interfaces/native/drag_and_drop.h index 6d0f68f3b82..319d56f9c7a 100644 --- a/interfaces/native/drag_and_drop.h +++ b/interfaces/native/drag_and_drop.h @@ -36,7 +36,7 @@ #define ARKUI_NATIVE_DRAG_AND_DROP_H #include - +#include #include "native_type.h" #include "ui_input_event.h" diff --git a/interfaces/native/ui_input_event.h b/interfaces/native/ui_input_event.h index 8181e74bbc2..28c879bc168 100644 --- a/interfaces/native/ui_input_event.h +++ b/interfaces/native/ui_input_event.h @@ -40,6 +40,7 @@ #include #else #include +#include #endif #ifdef __cplusplus -- Gitee