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

fix asan build failure

Browse Source 
Signed-off-by: cuitengfei <cuitengfei3@huawei.com>
Change-Id: I4a8fb42190603e9b26124983322a779b814fc26b
This commit is contained in:
cuitengfei 2024-06-03 21:17:56 +08:00
parent 6612bf8728
commit 07ba327b3c
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/libace.map
View File

@ -238,6 +238,7 @@
OHOS::Ace::ParseFontFeatureSettings*; OHOS::Ace::ParseFontFeatureSettings*;
OHOS::Ace::StorageProxy::*; OHOS::Ace::StorageProxy::*;
OHOS::Ace::EnvironmentProxy::*; OHOS::Ace::EnvironmentProxy::*;
OHOS::Ace::AceScoringLog::*;
virtual?thunk?to?OHOS::Ace::Animator::~Animator??; virtual?thunk?to?OHOS::Ace::Animator::~Animator??;
virtual?thunk?to?OHOS::Ace::Frontend::MaybeRelease*; virtual?thunk?to?OHOS::Ace::Frontend::MaybeRelease*;

2
frameworks/base/log/ace_scoring_log.h
View File

@ -26,7 +26,7 @@
namespace OHOS::Ace { namespace OHOS::Ace {
class ACE_EXPORT AceScoringLog final { class ACE_FORCE_EXPORT AceScoringLog final {
public: public:
explicit AceScoringLog(const std::string& eventName); explicit AceScoringLog(const std::string& eventName);
AceScoringLog(const std::string& pageName, const std::string& componentType, const std::string& procType); AceScoringLog(const std::string& pageName, const std::string& componentType, const std::string& procType);

8
frameworks/bridge/cj_frontend/BUILD.gn
View File

@ -142,7 +142,6 @@ template("cj_frontend") {
"interfaces/cj_ffi/cj_relative_container_ffi.cpp", "interfaces/cj_ffi/cj_relative_container_ffi.cpp",
"interfaces/cj_ffi/cj_richeditor_controller_ffi.cpp", "interfaces/cj_ffi/cj_richeditor_controller_ffi.cpp",
"interfaces/cj_ffi/cj_richeditor_ffi.cpp", "interfaces/cj_ffi/cj_richeditor_ffi.cpp",
"interfaces/cj_ffi/cj_richtext_ffi.cpp",
"interfaces/cj_ffi/cj_row_ffi.cpp", "interfaces/cj_ffi/cj_row_ffi.cpp",
"interfaces/cj_ffi/cj_row_split_ffi.cpp", "interfaces/cj_ffi/cj_row_split_ffi.cpp",
"interfaces/cj_ffi/cj_scroll_ffi.cpp", "interfaces/cj_ffi/cj_scroll_ffi.cpp",
@ -202,7 +201,6 @@ template("cj_frontend") {
sources -= [ sources -= [
"interfaces/cj_ffi/cj_richeditor_controller_ffi.cpp", "interfaces/cj_ffi/cj_richeditor_controller_ffi.cpp",
"interfaces/cj_ffi/cj_richeditor_ffi.cpp", "interfaces/cj_ffi/cj_richeditor_ffi.cpp",
"interfaces/cj_ffi/cj_richtext_ffi.cpp",
"interfaces/cj_ffi/state_manage/cj_environment.cpp", "interfaces/cj_ffi/state_manage/cj_environment.cpp",
"interfaces/cj_ffi/state_manage/cj_persistent_storage_ffi.cpp", "interfaces/cj_ffi/state_manage/cj_persistent_storage_ffi.cpp",
] ]
@ -213,6 +211,12 @@ template("cj_frontend") {
"interfaces/cj_ffi/state_manage/mock/cj_state_manage_mock.cpp", "interfaces/cj_ffi/state_manage/mock/cj_state_manage_mock.cpp",
] ]
} }
if (defined(config.web_components_support) &&
config.web_components_support) {
sources += [ "interfaces/cj_ffi/cj_richtext_ffi.cpp" ]
}
if (defined(config.video_components_support) && if (defined(config.video_components_support) &&
config.video_components_support) { config.video_components_support) {
sources += [ "interfaces/cj_ffi/cj_video_ffi.cpp" ] sources += [ "interfaces/cj_ffi/cj_video_ffi.cpp" ]

6
frameworks/bridge/declarative_frontend/view_stack_processor.h
View File

@ -65,7 +65,7 @@ public:
RefPtr<StepperItemComponent> GetStepperItemComponent(); RefPtr<StepperItemComponent> GetStepperItemComponent();
RefPtr<DisplayComponent> GetStepperDisplayComponent(); RefPtr<DisplayComponent> GetStepperDisplayComponent();
RefPtr<ScrollComponent> GetStepperScrollComponent(); RefPtr<ScrollComponent> GetStepperScrollComponent();
ACE_FORCE_EXPORT RefPtr<BoxComponent> GetBoxComponent(); RefPtr<BoxComponent> GetBoxComponent();
RefPtr<Component> GetMainComponent() const; RefPtr<Component> GetMainComponent() const;
RefPtr<DisplayComponent> GetDisplayComponent(); RefPtr<DisplayComponent> GetDisplayComponent();
bool HasDisplayComponent() const; bool HasDisplayComponent() const;
@ -81,9 +81,9 @@ public:
RefPtr<GestureComponent> GetGestureComponent(); RefPtr<GestureComponent> GetGestureComponent();
RefPtr<PositionedComponent> GetPositionedComponent(); RefPtr<PositionedComponent> GetPositionedComponent();
RefPtr<ComposedComponent> GetRootComponent(const std::string& id = "", const std::string& name = ""); RefPtr<ComposedComponent> GetRootComponent(const std::string& id = "", const std::string& name = "");
ACE_FORCE_EXPORT RefPtr<PageTransitionComponent> GetPageTransitionComponent(); RefPtr<PageTransitionComponent> GetPageTransitionComponent();
RefPtr<CoverageComponent> GetCoverageComponent(); RefPtr<CoverageComponent> GetCoverageComponent();
ACE_FORCE_EXPORT void ClearPageTransitionComponent(); void ClearPageTransitionComponent();
RefPtr<MenuComponent> GetMenuComponent(bool createNewComponent = true); RefPtr<MenuComponent> GetMenuComponent(bool createNewComponent = true);
#ifndef WEARABLE_PRODUCT #ifndef WEARABLE_PRODUCT
RefPtr<PopupComponentV2> GetPopupComponent(bool createNewComponent = true); RefPtr<PopupComponentV2> GetPopupComponent(bool createNewComponent = true);