diff --git a/build/libace.map b/build/libace.map index 1b2324719f8..9036fb84db0 100644 --- a/build/libace.map +++ b/build/libace.map @@ -238,6 +238,7 @@ OHOS::Ace::ParseFontFeatureSettings*; OHOS::Ace::StorageProxy::*; OHOS::Ace::EnvironmentProxy::*; + OHOS::Ace::AceScoringLog::*; virtual?thunk?to?OHOS::Ace::Animator::~Animator??; virtual?thunk?to?OHOS::Ace::Frontend::MaybeRelease*; diff --git a/frameworks/base/log/ace_scoring_log.h b/frameworks/base/log/ace_scoring_log.h index ab08b353bf7..d0a4c8edda5 100644 --- a/frameworks/base/log/ace_scoring_log.h +++ b/frameworks/base/log/ace_scoring_log.h @@ -26,7 +26,7 @@ namespace OHOS::Ace { -class ACE_EXPORT AceScoringLog final { +class ACE_FORCE_EXPORT AceScoringLog final { public: explicit AceScoringLog(const std::string& eventName); AceScoringLog(const std::string& pageName, const std::string& componentType, const std::string& procType); diff --git a/frameworks/bridge/cj_frontend/BUILD.gn b/frameworks/bridge/cj_frontend/BUILD.gn index 295644d4d28..59f98a46e08 100644 --- a/frameworks/bridge/cj_frontend/BUILD.gn +++ b/frameworks/bridge/cj_frontend/BUILD.gn @@ -142,7 +142,6 @@ template("cj_frontend") { "interfaces/cj_ffi/cj_relative_container_ffi.cpp", "interfaces/cj_ffi/cj_richeditor_controller_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_split_ffi.cpp", "interfaces/cj_ffi/cj_scroll_ffi.cpp", @@ -202,7 +201,6 @@ template("cj_frontend") { sources -= [ "interfaces/cj_ffi/cj_richeditor_controller_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_persistent_storage_ffi.cpp", ] @@ -213,6 +211,12 @@ template("cj_frontend") { "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) && config.video_components_support) { sources += [ "interfaces/cj_ffi/cj_video_ffi.cpp" ] diff --git a/frameworks/bridge/declarative_frontend/view_stack_processor.h b/frameworks/bridge/declarative_frontend/view_stack_processor.h index 6e158c26620..30abaab8c37 100644 --- a/frameworks/bridge/declarative_frontend/view_stack_processor.h +++ b/frameworks/bridge/declarative_frontend/view_stack_processor.h @@ -65,7 +65,7 @@ public: RefPtr GetStepperItemComponent(); RefPtr GetStepperDisplayComponent(); RefPtr GetStepperScrollComponent(); - ACE_FORCE_EXPORT RefPtr GetBoxComponent(); + RefPtr GetBoxComponent(); RefPtr GetMainComponent() const; RefPtr GetDisplayComponent(); bool HasDisplayComponent() const; @@ -81,9 +81,9 @@ public: RefPtr GetGestureComponent(); RefPtr GetPositionedComponent(); RefPtr GetRootComponent(const std::string& id = "", const std::string& name = ""); - ACE_FORCE_EXPORT RefPtr GetPageTransitionComponent(); + RefPtr GetPageTransitionComponent(); RefPtr GetCoverageComponent(); - ACE_FORCE_EXPORT void ClearPageTransitionComponent(); + void ClearPageTransitionComponent(); RefPtr GetMenuComponent(bool createNewComponent = true); #ifndef WEARABLE_PRODUCT RefPtr GetPopupComponent(bool createNewComponent = true);