openharmony/accessibility
1
0
Fork 0
mirror of https://gitee.com/openharmony/accessibility synced 2024-11-23 06:50:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!577 无障碍子系统：InnerAPI依赖整改和符号优化

Browse Source 
Merge pull request !577 from wangxinqiang007/master
This commit is contained in:
openharmony_ci 2023-04-28 06:46:26 +00:00 committed by Gitee
commit 310b959bae
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
11 changed files with 122 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/interface/BUILD.gn
View File

@ -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

10
common/interface/libaccessibility_interface.map
View File

@ -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:
*;

11
interfaces/innerkits/aafwk/BUILD.gn
View File

@ -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"

25
interfaces/innerkits/aafwk/libaccessibility_aafwk.map Normal file
View File

@ -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:
*;
};

6
interfaces/innerkits/acfwk/BUILD.gn
View File

@ -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"

28
interfaces/innerkits/acfwk/libaccessibility_acfwk.map Normal file
View File

@ -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:
*;
};

6
interfaces/innerkits/asacfwk/BUILD.gn
View File

@ -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"

27
interfaces/innerkits/asacfwk/libaccessibility_asacfwk.map Normal file
View File

@ -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:
*;
};

3
interfaces/innerkits/common/BUILD.gn
View File

@ -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"
}

22
interfaces/innerkits/common/libaccessibility_common.map
View File

@ -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:
*;

2
services/aams/BUILD.gn
View File

@ -86,7 +86,7 @@ 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",