diff --git a/common/interface/BUILD.gn b/common/interface/BUILD.gn index 85adf525dcca0ef7bfe6021aad3f4440b72bff05..543dbb81aa0e37e3b7ce10437fd782c0276bfa9a 100644 --- a/common/interface/BUILD.gn +++ b/common/interface/BUILD.gn @@ -86,7 +86,7 @@ ohos_shared_library("accessibility_interface") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "input:libmmi-client", - "ipc:ipc_core", + "ipc:ipc_single", ] install_enable = true diff --git a/common/interface/libaccessibility_interface.map b/common/interface/libaccessibility_interface.map index 20ca5101112dfd5b57857cdf06d9f23b2a0d1a26..2e73b5286c125808a913e7be56c582e8fcc64708 100644 --- a/common/interface/libaccessibility_interface.map +++ b/common/interface/libaccessibility_interface.map @@ -43,7 +43,7 @@ non-virtual?thunk?to?OHOS::Accessibility::RectParcel*; non-virtual?thunk?to?OHOS::Accessibility::AccessibilityElementOperatorCallbackStub*; non-virtual?thunk?to?OHOS::Accessibility::AccessibleAbilityClientStub*; - "virtual thunk to OHOS::Accessibility::AccessibleAbilityClientStub*"; + virtual?thunk?to?OHOS::Accessibility::AccessibleAbilityClientStub*"; non-virtual?thunk?to?OHOS::Accessibility::AccessibilityElementOperatorStub*; virtual?thunk?to?OHOS::Accessibility::AccessibleAbilityClientStub*; virtual?thunk?to?OHOS::Accessibility::AccessibilityElementOperatorStub*; @@ -52,6 +52,14 @@ virtual?thunk?to?OHOS::Accessibility::AccessibleAbilityChannelStub*; OHOS::SystemAbilityLoadCallbackStub*; VTT?for?OHOS::SystemAbilityLoadCallbackStub*; + VTT?for?OHOS::Accessibility::*Parcel; + VTT?for?OHOS::Accessibility::*Proxy; + VTT?for?OHOS::Accessibility::*Stub; + vtable?for?OHOS::Accessibility::Rect*; + vtable?for?OHOS::Accessibility::*Parcel*; + vtable?for?OHOS::Accessibility::*Proxy*; + vtable?for?OHOS::Accessibility::*Stub*; + vtable?for?OHOS::BrokerDelegator*; }; local: *; diff --git a/interfaces/innerkits/aafwk/BUILD.gn b/interfaces/innerkits/aafwk/BUILD.gn index bd0f7e0a04f33a4f7f2200b876cb65da857cc225..efa91bd6ef45d01b2f1e62d131466ee7ec2dee8f 100644 --- a/interfaces/innerkits/aafwk/BUILD.gn +++ b/interfaces/innerkits/aafwk/BUILD.gn @@ -31,10 +31,7 @@ config("accessibleability_private_config") { } config("accessibleability_public_config") { - include_dirs = [ - "include", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include", - ] + include_dirs = [ "include" ] } aafwk_files = [ @@ -46,7 +43,7 @@ aafwk_files = [ ohos_shared_library("accessibleability") { sources = aafwk_files - + version_script = "libaccessibility_aafwk.map" configs = [ ":accessibleability_private_config" ] public_configs = [ @@ -63,12 +60,12 @@ ohos_shared_library("accessibleability") { "init:libbeget_proxy", "init:libbegetutil", "input:libmmi-client", - "ipc:ipc_core", + "ipc:ipc_single", "samgr:samgr_proxy", ] public_deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common" ] - + innerapi_tags = [ "platformsdk" ] install_enable = true subsystem_name = "barrierfree" diff --git a/interfaces/innerkits/aafwk/libaccessibility_aafwk.map b/interfaces/innerkits/aafwk/libaccessibility_aafwk.map new file mode 100644 index 0000000000000000000000000000000000000000..29ede817a2efe488964927ec6bc783cfacdfaaeb --- /dev/null +++ b/interfaces/innerkits/aafwk/libaccessibility_aafwk.map @@ -0,0 +1,25 @@ +{ + global: + extern "C++" { + OHOS::Accessibility::AccessibleAbilityChannelClient*; + OHOS::Accessibility::AccessibleAbilityClientImpl*; + OHOS::Accessibility::AccessibleAbilityClient::GetInstance*; + VTT?for?OHOS::Accessibility::AccessibleAbilityClientImpl*; + non-virtual?thunk?to?OHOS::Accessibility::AccessibleAbilityClientImpl*; + virtual?thunk?to?OHOS::Accessibility::AccessibleAbilityClientImpl*; + OHOS::Accessibility::AccessibilityUITestAbilityImpl*; + OHOS::Accessibility::AccessibilityUITestAbility*; + vtable?for?OHOS::Accessibility::AccessibilityUITestAbilityImpl*; + vtable?for?OHOS::Accessibility::AccessibleAbilityClientImpl*; + OHOS::Accessibility::AccessibilityElementOperatorCallbackImpl*; + non-virtual?thunk?to?OHOS::Accessibility::AccessibilityElementOperatorCallbackImpl*; + vtable?for?OHOS::Accessibility::AccessibilityElementOperatorCallbackImpl*; + VTT?for?OHOS::Accessibility::AccessibilityElementOperatorCallbackImpl*; + vtable?for?OHOS::Accessibility::Rect*; + vtable?for?OHOS::Accessibility::AccessibleAbilityClientImpl::AccessibilityServiceDeathRecipient*; + OHOS::IRemoteStub*; + OHOS::ISystemAbilityManager::SAMANAGER_INTERFACE_TOKEN; + }; + local: + *; +}; \ No newline at end of file diff --git a/interfaces/innerkits/acfwk/BUILD.gn b/interfaces/innerkits/acfwk/BUILD.gn index ec633b306e5b1e4584ead52e12518027b5efc4a8..65171f8cd3092f73060e33f289c5cdd0490796a4 100755 --- a/interfaces/innerkits/acfwk/BUILD.gn +++ b/interfaces/innerkits/acfwk/BUILD.gn @@ -41,7 +41,7 @@ acfwk_src = [ ohos_shared_library("accessibilityconfig") { sources = acfwk_src - + version_script = "libaccessibility_acfwk.map" configs = [ ":accessibilityconfig_private_config", "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", @@ -59,11 +59,11 @@ ohos_shared_library("accessibilityconfig") { "hiviewdfx_hilog_native:libhilog", "init:libbeget_proxy", "init:libbegetutil", - "ipc:ipc_core", + "ipc:ipc_single", "napi:ace_napi", "samgr:samgr_proxy", ] - + innerapi_tags = [ "platformsdk" ] install_enable = true subsystem_name = "barrierfree" diff --git a/interfaces/innerkits/acfwk/libaccessibility_acfwk.map b/interfaces/innerkits/acfwk/libaccessibility_acfwk.map new file mode 100644 index 0000000000000000000000000000000000000000..7d6d964fcc7f940e773c97154b4c0afc35770eb4 --- /dev/null +++ b/interfaces/innerkits/acfwk/libaccessibility_acfwk.map @@ -0,0 +1,28 @@ +{ + global: + extern "C++" { + OHOS::BrokerDelegator*; + vtable?for?OHOS::BrokerDelegator*; + OHOS::IRemoteStub*; + NAccessibilityConfigObserverImpl*; + NAccessibilityConfigObserver::Notify*; + NAccessibilityConfigObserver::Subscribe*; + NAccessibilityConfigObserver::Unsubscribe*; + NAccessibilityConfigObserver::OnConfigChanged*; + vtable?for?NAccessibilityConfigObserverImpl*; + OHOS::Accessibility::AccessibleAbilityManagerServiceProxy::delegator*; + OHOS::ISystemAbilityManager::SAMANAGER_INTERFACE_TOKEN; + non-virtual?thunk?to?OHOS::IRemoteStub*; + OHOS::AccessibilityConfig::AccessibilityConfig*; + OHOS::AccessibilityConfig::AccessibilityConfig::Impl*; + vtable?for?OHOS::AccessibilityConfig::AccessibilityConfig::Impl::AccessibilityEnableAbilityListsObserverImpl*; + vtable?for?OHOS::AccessibilityConfig::AccessibilityConfig::Impl::AccessibleAbilityManagerCaptionObserverImpl*; + vtable?for?OHOS::AccessibilityConfig::AccessibilityConfig::Impl::AccessibleAbilityManagerConfigObserverImpl*; + VTT?for?OHOS::AccessibilityConfig::AccessibilityConfig::Impl::AccessibilityEnableAbilityListsObserverImpl*; + VTT?for?OHOS::AccessibilityConfig::AccessibilityConfig::Impl::AccessibilityEnableAbilityListsObserverImpl*; + VTT?for?OHOS::AccessibilityConfig::AccessibilityConfig::Impl::AccessibilityEnableAbilityListsObserverImpl*; + vtable?for?OHOS::AccessibilityConfig::AccessibilityConfig::Impl::DeathRecipient*; + }; + local: + *; +}; \ No newline at end of file diff --git a/interfaces/innerkits/asacfwk/BUILD.gn b/interfaces/innerkits/asacfwk/BUILD.gn index 595dedf376f2cc0775ba4466fc5b864c7ca86a75..834c677ba1ab55075c4bf406d19412adb9869db8 100644 --- a/interfaces/innerkits/asacfwk/BUILD.gn +++ b/interfaces/innerkits/asacfwk/BUILD.gn @@ -40,7 +40,7 @@ asacfwk_src = [ ohos_shared_library("accessibilityclient") { sources = asacfwk_src - + version_script = "libaccessibility_asacfwk.map" configs = [ ":accessibilityclient_private_config", "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", @@ -57,10 +57,10 @@ ohos_shared_library("accessibilityclient") { "hiviewdfx_hilog_native:libhilog", "init:libbeget_proxy", "init:libbegetutil", - "ipc:ipc_core", + "ipc:ipc_single", "samgr:samgr_proxy", ] - + innerapi_tags = [ "platformsdk" ] install_enable = true subsystem_name = "barrierfree" diff --git a/interfaces/innerkits/asacfwk/libaccessibility_asacfwk.map b/interfaces/innerkits/asacfwk/libaccessibility_asacfwk.map new file mode 100644 index 0000000000000000000000000000000000000000..84c1f136c9f8dfcb077dade736755ddbeaef3203 --- /dev/null +++ b/interfaces/innerkits/asacfwk/libaccessibility_asacfwk.map @@ -0,0 +1,27 @@ +{ + global: + extern "C++" { + OHOS::Accessibility::AccessibilitySystemAbilityClient::GetInstance*; + OHOS::Accessibility::AccessibilitySystemAbilityClientImpl*; + OHOS::Accessibility::AccessibilityElementOperatorImpl*; + virtual?thunk?to?OHOS::Accessibility::AccessibilityElementOperatorImpl::~AccessibilityElementOperatorImpl*; + non-virtual?thunk?to?OHOS::Accessibility::AccessibilityElementOperatorImpl::SearchElementInfo*; + non-virtual?thunk?to?OHOS::Accessibility::AccessibilityElementOperatorImpl::FocusMoveSearch*; + non-virtual?thunk?to?OHOS::Accessibility::AccessibilityElementOperatorImpl::ClearFocus*; + non-virtual?thunk?to?OHOS::Accessibility::AccessibilityElementOperatorImpl::OutsideTouch*; + non-virtual?thunk?to?OHOS::Accessibility::AccessibilityElementOperatorImpl::~AccessibilityElementOperatorImpl*; + non-virtual?thunk?to?OHOS::Accessibility::AccessibilitySystemAbilityClientImpl::Set*; + non-virtual?thunk?to?OHOS::Accessibility::AccessibilitySystemAbilityClientImpl::~AccessibilitySystemAbilityClientImpl*; + vtable?for?OHOS::Accessibility::AccessibilitySystemAbilityClientImpl::AccessibleAbilityManagerStateObserverImpl*; + vtable?for?OHOS::Accessibility::AccessibilitySystemAbilityClientImpl; + vtable?for?OHOS::Accessibility::AccessibilityElementOperatorImpl*; + vtable?for?OHOS::Accessibility::AccessibilitySystemAbilityClientImpl::DeathRecipient*; + OHOS::ISystemAbilityManager::SAMANAGER_INTERFACE_TOKEN; + OHOS::IRemoteStub*; + VTT?for?OHOS::Accessibility::AccessibilityElementOperatorImpl; + non-virtual?thunk?to?OHOS::IRemoteStub*; + VTT?for?OHOS::Accessibility::AccessibilitySystemAbilityClientImpl::AccessibleAbilityManagerStateObserverImpl*; + }; + local: + *; +}; \ No newline at end of file diff --git a/interfaces/innerkits/common/BUILD.gn b/interfaces/innerkits/common/BUILD.gn index 3405f82a9d8cb29062d49d88155a8461dbfd7ebc..a601382adb912cd3f472be0076adaea54d45f165 100644 --- a/interfaces/innerkits/common/BUILD.gn +++ b/interfaces/innerkits/common/BUILD.gn @@ -44,6 +44,7 @@ accessibility_common_src = [ ohos_shared_library("accessibility_common") { sources = accessibility_common_src + version_script = "libaccessibility_common.map" configs = [ ":accessibility_common_private_config", "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", @@ -58,7 +59,7 @@ ohos_shared_library("accessibility_common") { "input:libmmi-client", "napi:ace_napi", ] - + innerapi_tags = [ "platformsdk" ] subsystem_name = "barrierfree" part_name = "accessibility" } diff --git a/interfaces/innerkits/common/libaccessibility_common.map b/interfaces/innerkits/common/libaccessibility_common.map index 48d68c0e49573298c23779802bf7a4e640eb8bf3..4f69398ad76e926e234a331e3959d4363cb6fbc9 100644 --- a/interfaces/innerkits/common/libaccessibility_common.map +++ b/interfaces/innerkits/common/libaccessibility_common.map @@ -17,11 +17,27 @@ OHOS::Accessibility::ANY_WINDOW_ID; OHOS::Accessibility::FOCUS_*; OHOS::Accessibility::INVALID_*; - OHOS::Accessibility::ROOT_NODE_ID*; - OHOS::Accessibility::GET_SOURCE_PREFETCH_MODE*; + OHOS::Accessibility::ROOT_*; + OHOS::Accessibility::GET_SOURCE_PREFETCH_MODE; OHOS::Accessibility::ACTIVE_WINDOW_ID; - OHOS::Accessibility::ACTION_ARGU_SET_TEXT; + OHOS::Accessibility::ACTION_ARGU_*; OHOS::Accessibility::PREFETCH_*; + OHOS::Accessibility::HTML_ITEM_*; + OHOS::Accessibility::HOST_VIEW_ID; + OHOS::Accessibility::MAX_TEXT_LENGTH; + OHOS::Accessibility::MOVE_UNIT_*; + OHOS::Accessibility::UNDEFINED*; + OHOS::Accessibility::SELECTION_*; + OHOS::AccessibilityNapi::Convert*; + OHOS::AccessibilityNapi::Parse*; + OHOS::AccessibilityNapi::Check*; + OHOS::AccessibilityNapi::Get*; + OHOS::AccessibilityNapi::Set*; + OHOS::AccessibilityNapi::HasKeyCode*; + OHOS::AccessibilityNapi::Query*; + OHOS::AccessibilityNapi::Create*; + OHOS::AccessibilityNapi::Transform*; + vtable?for?OHOS::Accessibility::Rect*; }; local: *; diff --git a/services/aams/BUILD.gn b/services/aams/BUILD.gn index c89213d2812e603db01695647a1fe322f87bd391..21034d1725161b9c6f8a0423c47ce28df02cf816 100755 --- a/services/aams/BUILD.gn +++ b/services/aams/BUILD.gn @@ -87,8 +87,9 @@ ohos_shared_library("accessibleabilityms") { "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", "input:libmmi-client", - "ipc:ipc_core", + "ipc:ipc_single", "os_account:os_account_innerkits", + "power_manager:powermgr_client", "preferences:native_preferences", "safwk:system_ability_fwk", "samgr:samgr_proxy",