diff --git a/bundle.json b/bundle.json index 203739ab..4b884763 100644 --- a/bundle.json +++ b/bundle.json @@ -44,17 +44,23 @@ "third_party": [] }, "build": { - "sub_component": [ - "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability", - "//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk:accessibilityconfig", - "//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk:accessibilityclient", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/interfaces/kits/napi:napi_packages", - "//foundation/barrierfree/accessibility/sa_profile:aams_sa_profile", - "//foundation/barrierfree/accessibility/sa_profile:accessibility_cfg" - ], + "group_type": { + "base_group": [ + "//foundation/barrierfree/accessibility/interfaces/kits/napi:napi_packages" + ], + "fwk_group": [ + "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability", + "//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk:accessibilityconfig", + "//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk:accessibilityclient", + "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface" + ], + "service_group": [ + "//foundation/barrierfree/accessibility/sa_profile:aams_sa_profile", + "//foundation/barrierfree/accessibility/sa_profile:accessibility_cfg", + "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms" + ] + }, "inner_kits": [ { "type": "so", diff --git a/services/interface/BUILD.gn b/common/interface/BUILD.gn similarity index 84% rename from services/interface/BUILD.gn rename to common/interface/BUILD.gn index 02b1df39..43150581 100644 --- a/services/interface/BUILD.gn +++ b/common/interface/BUILD.gn @@ -13,13 +13,13 @@ import("//build/ohos.gni") -config("aams_interface_private_config") { +config("accessibility_interface_private_config") { visibility = [ ":*" ] include_dirs = [ "//foundation/barrierfree/accessibility/common/log/include" ] defines = [ - "AAMS_LOG_TAG = \"aams_interface\"", + "AAMS_LOG_TAG = \"accessibility_interface\"", "AAMS_LOG_DOMAIN = 0xD001D02", ] @@ -28,14 +28,14 @@ config("aams_interface_private_config") { } } -config("aams_interface_public_config") { +config("accessibility_interface_public_config") { include_dirs = [ "include", "include/parcel", ] } -aams_interface_src = [ +accessibility_interface_src = [ "src/accessibility_element_operator_callback_proxy.cpp", "src/accessibility_element_operator_callback_stub.cpp", "src/accessibility_element_operator_proxy.cpp", @@ -56,7 +56,7 @@ aams_interface_src = [ "src/accessible_ability_manager_config_observer_stub.cpp", ] -aams_data_parcel_src = [ +accessibility_data_parcel_src = [ "src/parcel/accessibility_ability_info_parcel.cpp", "src/parcel/accessibility_caption_parcel.cpp", "src/parcel/accessibility_element_info_parcel.cpp", @@ -65,13 +65,13 @@ aams_data_parcel_src = [ "src/parcel/accessibility_gesture_inject_path_parcel.cpp", ] -ohos_shared_library("aams_interface") { - sources = aams_interface_src - sources += aams_data_parcel_src +ohos_shared_library("accessibility_interface") { + sources = accessibility_interface_src + sources += accessibility_data_parcel_src - configs = [ ":aams_interface_private_config" ] + configs = [ ":accessibility_interface_private_config" ] - public_configs = [ ":aams_interface_public_config" ] + public_configs = [ ":accessibility_interface_public_config" ] deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common" ] diff --git a/services/interface/include/accessibility_element_operator_callback_proxy.h b/common/interface/include/accessibility_element_operator_callback_proxy.h similarity index 100% rename from services/interface/include/accessibility_element_operator_callback_proxy.h rename to common/interface/include/accessibility_element_operator_callback_proxy.h diff --git a/services/interface/include/accessibility_element_operator_callback_stub.h b/common/interface/include/accessibility_element_operator_callback_stub.h similarity index 100% rename from services/interface/include/accessibility_element_operator_callback_stub.h rename to common/interface/include/accessibility_element_operator_callback_stub.h diff --git a/services/interface/include/accessibility_element_operator_proxy.h b/common/interface/include/accessibility_element_operator_proxy.h similarity index 100% rename from services/interface/include/accessibility_element_operator_proxy.h rename to common/interface/include/accessibility_element_operator_proxy.h diff --git a/services/interface/include/accessibility_element_operator_stub.h b/common/interface/include/accessibility_element_operator_stub.h similarity index 100% rename from services/interface/include/accessibility_element_operator_stub.h rename to common/interface/include/accessibility_element_operator_stub.h diff --git a/services/interface/include/accessibility_enable_ability_lists_observer_proxy.h b/common/interface/include/accessibility_enable_ability_lists_observer_proxy.h similarity index 100% rename from services/interface/include/accessibility_enable_ability_lists_observer_proxy.h rename to common/interface/include/accessibility_enable_ability_lists_observer_proxy.h diff --git a/services/interface/include/accessibility_enable_ability_lists_observer_stub.h b/common/interface/include/accessibility_enable_ability_lists_observer_stub.h similarity index 100% rename from services/interface/include/accessibility_enable_ability_lists_observer_stub.h rename to common/interface/include/accessibility_enable_ability_lists_observer_stub.h diff --git a/services/interface/include/accessible_ability_channel_proxy.h b/common/interface/include/accessible_ability_channel_proxy.h similarity index 100% rename from services/interface/include/accessible_ability_channel_proxy.h rename to common/interface/include/accessible_ability_channel_proxy.h diff --git a/services/interface/include/accessible_ability_channel_stub.h b/common/interface/include/accessible_ability_channel_stub.h similarity index 100% rename from services/interface/include/accessible_ability_channel_stub.h rename to common/interface/include/accessible_ability_channel_stub.h diff --git a/services/interface/include/accessible_ability_client_proxy.h b/common/interface/include/accessible_ability_client_proxy.h similarity index 100% rename from services/interface/include/accessible_ability_client_proxy.h rename to common/interface/include/accessible_ability_client_proxy.h diff --git a/services/interface/include/accessible_ability_client_stub.h b/common/interface/include/accessible_ability_client_stub.h similarity index 100% rename from services/interface/include/accessible_ability_client_stub.h rename to common/interface/include/accessible_ability_client_stub.h diff --git a/services/interface/include/accessible_ability_manager_caption_observer_proxy.h b/common/interface/include/accessible_ability_manager_caption_observer_proxy.h similarity index 100% rename from services/interface/include/accessible_ability_manager_caption_observer_proxy.h rename to common/interface/include/accessible_ability_manager_caption_observer_proxy.h diff --git a/services/interface/include/accessible_ability_manager_caption_observer_stub.h b/common/interface/include/accessible_ability_manager_caption_observer_stub.h similarity index 100% rename from services/interface/include/accessible_ability_manager_caption_observer_stub.h rename to common/interface/include/accessible_ability_manager_caption_observer_stub.h diff --git a/services/interface/include/accessible_ability_manager_config_observer_proxy.h b/common/interface/include/accessible_ability_manager_config_observer_proxy.h similarity index 100% rename from services/interface/include/accessible_ability_manager_config_observer_proxy.h rename to common/interface/include/accessible_ability_manager_config_observer_proxy.h diff --git a/services/interface/include/accessible_ability_manager_config_observer_stub.h b/common/interface/include/accessible_ability_manager_config_observer_stub.h similarity index 100% rename from services/interface/include/accessible_ability_manager_config_observer_stub.h rename to common/interface/include/accessible_ability_manager_config_observer_stub.h diff --git a/services/interface/include/accessible_ability_manager_service_proxy.h b/common/interface/include/accessible_ability_manager_service_proxy.h similarity index 100% rename from services/interface/include/accessible_ability_manager_service_proxy.h rename to common/interface/include/accessible_ability_manager_service_proxy.h diff --git a/services/interface/include/accessible_ability_manager_service_stub.h b/common/interface/include/accessible_ability_manager_service_stub.h similarity index 100% rename from services/interface/include/accessible_ability_manager_service_stub.h rename to common/interface/include/accessible_ability_manager_service_stub.h diff --git a/services/interface/include/accessible_ability_manager_state_observer_proxy.h b/common/interface/include/accessible_ability_manager_state_observer_proxy.h similarity index 100% rename from services/interface/include/accessible_ability_manager_state_observer_proxy.h rename to common/interface/include/accessible_ability_manager_state_observer_proxy.h diff --git a/services/interface/include/accessible_ability_manager_state_observer_stub.h b/common/interface/include/accessible_ability_manager_state_observer_stub.h similarity index 100% rename from services/interface/include/accessible_ability_manager_state_observer_stub.h rename to common/interface/include/accessible_ability_manager_state_observer_stub.h diff --git a/services/interface/include/i_accessibility_element_operator.h b/common/interface/include/i_accessibility_element_operator.h similarity index 100% rename from services/interface/include/i_accessibility_element_operator.h rename to common/interface/include/i_accessibility_element_operator.h diff --git a/services/interface/include/i_accessibility_element_operator_callback.h b/common/interface/include/i_accessibility_element_operator_callback.h similarity index 100% rename from services/interface/include/i_accessibility_element_operator_callback.h rename to common/interface/include/i_accessibility_element_operator_callback.h diff --git a/services/interface/include/i_accessibility_enable_ability_lists_observer.h b/common/interface/include/i_accessibility_enable_ability_lists_observer.h similarity index 100% rename from services/interface/include/i_accessibility_enable_ability_lists_observer.h rename to common/interface/include/i_accessibility_enable_ability_lists_observer.h diff --git a/services/interface/include/i_accessible_ability_channel.h b/common/interface/include/i_accessible_ability_channel.h similarity index 100% rename from services/interface/include/i_accessible_ability_channel.h rename to common/interface/include/i_accessible_ability_channel.h diff --git a/services/interface/include/i_accessible_ability_client.h b/common/interface/include/i_accessible_ability_client.h similarity index 100% rename from services/interface/include/i_accessible_ability_client.h rename to common/interface/include/i_accessible_ability_client.h diff --git a/services/interface/include/i_accessible_ability_manager_caption_observer.h b/common/interface/include/i_accessible_ability_manager_caption_observer.h similarity index 100% rename from services/interface/include/i_accessible_ability_manager_caption_observer.h rename to common/interface/include/i_accessible_ability_manager_caption_observer.h diff --git a/services/interface/include/i_accessible_ability_manager_config_observer.h b/common/interface/include/i_accessible_ability_manager_config_observer.h similarity index 100% rename from services/interface/include/i_accessible_ability_manager_config_observer.h rename to common/interface/include/i_accessible_ability_manager_config_observer.h diff --git a/services/interface/include/i_accessible_ability_manager_service.h b/common/interface/include/i_accessible_ability_manager_service.h similarity index 100% rename from services/interface/include/i_accessible_ability_manager_service.h rename to common/interface/include/i_accessible_ability_manager_service.h diff --git a/services/interface/include/i_accessible_ability_manager_state_observer.h b/common/interface/include/i_accessible_ability_manager_state_observer.h similarity index 100% rename from services/interface/include/i_accessible_ability_manager_state_observer.h rename to common/interface/include/i_accessible_ability_manager_state_observer.h diff --git a/services/interface/include/parcel/accessibility_ability_info_parcel.h b/common/interface/include/parcel/accessibility_ability_info_parcel.h similarity index 100% rename from services/interface/include/parcel/accessibility_ability_info_parcel.h rename to common/interface/include/parcel/accessibility_ability_info_parcel.h diff --git a/services/interface/include/parcel/accessibility_caption_parcel.h b/common/interface/include/parcel/accessibility_caption_parcel.h similarity index 100% rename from services/interface/include/parcel/accessibility_caption_parcel.h rename to common/interface/include/parcel/accessibility_caption_parcel.h diff --git a/services/interface/include/parcel/accessibility_element_info_parcel.h b/common/interface/include/parcel/accessibility_element_info_parcel.h similarity index 100% rename from services/interface/include/parcel/accessibility_element_info_parcel.h rename to common/interface/include/parcel/accessibility_element_info_parcel.h diff --git a/services/interface/include/parcel/accessibility_event_info_parcel.h b/common/interface/include/parcel/accessibility_event_info_parcel.h similarity index 100% rename from services/interface/include/parcel/accessibility_event_info_parcel.h rename to common/interface/include/parcel/accessibility_event_info_parcel.h diff --git a/services/interface/include/parcel/accessibility_gesture_inject_path_parcel.h b/common/interface/include/parcel/accessibility_gesture_inject_path_parcel.h similarity index 100% rename from services/interface/include/parcel/accessibility_gesture_inject_path_parcel.h rename to common/interface/include/parcel/accessibility_gesture_inject_path_parcel.h diff --git a/services/interface/include/parcel/accessibility_window_info_parcel.h b/common/interface/include/parcel/accessibility_window_info_parcel.h similarity index 100% rename from services/interface/include/parcel/accessibility_window_info_parcel.h rename to common/interface/include/parcel/accessibility_window_info_parcel.h diff --git a/services/interface/include/parcel/parcel_util.h b/common/interface/include/parcel/parcel_util.h similarity index 100% rename from services/interface/include/parcel/parcel_util.h rename to common/interface/include/parcel/parcel_util.h diff --git a/services/interface/src/accessibility_element_operator_callback_proxy.cpp b/common/interface/src/accessibility_element_operator_callback_proxy.cpp similarity index 100% rename from services/interface/src/accessibility_element_operator_callback_proxy.cpp rename to common/interface/src/accessibility_element_operator_callback_proxy.cpp diff --git a/services/interface/src/accessibility_element_operator_callback_stub.cpp b/common/interface/src/accessibility_element_operator_callback_stub.cpp similarity index 100% rename from services/interface/src/accessibility_element_operator_callback_stub.cpp rename to common/interface/src/accessibility_element_operator_callback_stub.cpp diff --git a/services/interface/src/accessibility_element_operator_proxy.cpp b/common/interface/src/accessibility_element_operator_proxy.cpp similarity index 100% rename from services/interface/src/accessibility_element_operator_proxy.cpp rename to common/interface/src/accessibility_element_operator_proxy.cpp diff --git a/services/interface/src/accessibility_element_operator_stub.cpp b/common/interface/src/accessibility_element_operator_stub.cpp similarity index 100% rename from services/interface/src/accessibility_element_operator_stub.cpp rename to common/interface/src/accessibility_element_operator_stub.cpp diff --git a/services/interface/src/accessibility_enable_ability_lists_observer_proxy.cpp b/common/interface/src/accessibility_enable_ability_lists_observer_proxy.cpp similarity index 100% rename from services/interface/src/accessibility_enable_ability_lists_observer_proxy.cpp rename to common/interface/src/accessibility_enable_ability_lists_observer_proxy.cpp diff --git a/services/interface/src/accessibility_enable_ability_lists_observer_stub.cpp b/common/interface/src/accessibility_enable_ability_lists_observer_stub.cpp similarity index 100% rename from services/interface/src/accessibility_enable_ability_lists_observer_stub.cpp rename to common/interface/src/accessibility_enable_ability_lists_observer_stub.cpp diff --git a/services/interface/src/accessible_ability_channel_proxy.cpp b/common/interface/src/accessible_ability_channel_proxy.cpp similarity index 100% rename from services/interface/src/accessible_ability_channel_proxy.cpp rename to common/interface/src/accessible_ability_channel_proxy.cpp diff --git a/services/interface/src/accessible_ability_channel_stub.cpp b/common/interface/src/accessible_ability_channel_stub.cpp similarity index 100% rename from services/interface/src/accessible_ability_channel_stub.cpp rename to common/interface/src/accessible_ability_channel_stub.cpp diff --git a/services/interface/src/accessible_ability_client_proxy.cpp b/common/interface/src/accessible_ability_client_proxy.cpp similarity index 100% rename from services/interface/src/accessible_ability_client_proxy.cpp rename to common/interface/src/accessible_ability_client_proxy.cpp diff --git a/services/interface/src/accessible_ability_client_stub.cpp b/common/interface/src/accessible_ability_client_stub.cpp similarity index 100% rename from services/interface/src/accessible_ability_client_stub.cpp rename to common/interface/src/accessible_ability_client_stub.cpp diff --git a/services/interface/src/accessible_ability_manager_caption_observer_proxy.cpp b/common/interface/src/accessible_ability_manager_caption_observer_proxy.cpp similarity index 100% rename from services/interface/src/accessible_ability_manager_caption_observer_proxy.cpp rename to common/interface/src/accessible_ability_manager_caption_observer_proxy.cpp diff --git a/services/interface/src/accessible_ability_manager_caption_observer_stub.cpp b/common/interface/src/accessible_ability_manager_caption_observer_stub.cpp similarity index 100% rename from services/interface/src/accessible_ability_manager_caption_observer_stub.cpp rename to common/interface/src/accessible_ability_manager_caption_observer_stub.cpp diff --git a/services/interface/src/accessible_ability_manager_config_observer_proxy.cpp b/common/interface/src/accessible_ability_manager_config_observer_proxy.cpp similarity index 100% rename from services/interface/src/accessible_ability_manager_config_observer_proxy.cpp rename to common/interface/src/accessible_ability_manager_config_observer_proxy.cpp diff --git a/services/interface/src/accessible_ability_manager_config_observer_stub.cpp b/common/interface/src/accessible_ability_manager_config_observer_stub.cpp similarity index 100% rename from services/interface/src/accessible_ability_manager_config_observer_stub.cpp rename to common/interface/src/accessible_ability_manager_config_observer_stub.cpp diff --git a/services/interface/src/accessible_ability_manager_service_proxy.cpp b/common/interface/src/accessible_ability_manager_service_proxy.cpp similarity index 100% rename from services/interface/src/accessible_ability_manager_service_proxy.cpp rename to common/interface/src/accessible_ability_manager_service_proxy.cpp diff --git a/services/interface/src/accessible_ability_manager_service_stub.cpp b/common/interface/src/accessible_ability_manager_service_stub.cpp similarity index 100% rename from services/interface/src/accessible_ability_manager_service_stub.cpp rename to common/interface/src/accessible_ability_manager_service_stub.cpp diff --git a/services/interface/src/accessible_ability_manager_state_observer_proxy.cpp b/common/interface/src/accessible_ability_manager_state_observer_proxy.cpp similarity index 100% rename from services/interface/src/accessible_ability_manager_state_observer_proxy.cpp rename to common/interface/src/accessible_ability_manager_state_observer_proxy.cpp diff --git a/services/interface/src/accessible_ability_manager_state_observer_stub.cpp b/common/interface/src/accessible_ability_manager_state_observer_stub.cpp similarity index 100% rename from services/interface/src/accessible_ability_manager_state_observer_stub.cpp rename to common/interface/src/accessible_ability_manager_state_observer_stub.cpp diff --git a/services/interface/src/parcel/accessibility_ability_info_parcel.cpp b/common/interface/src/parcel/accessibility_ability_info_parcel.cpp similarity index 100% rename from services/interface/src/parcel/accessibility_ability_info_parcel.cpp rename to common/interface/src/parcel/accessibility_ability_info_parcel.cpp diff --git a/services/interface/src/parcel/accessibility_caption_parcel.cpp b/common/interface/src/parcel/accessibility_caption_parcel.cpp similarity index 100% rename from services/interface/src/parcel/accessibility_caption_parcel.cpp rename to common/interface/src/parcel/accessibility_caption_parcel.cpp diff --git a/services/interface/src/parcel/accessibility_element_info_parcel.cpp b/common/interface/src/parcel/accessibility_element_info_parcel.cpp similarity index 100% rename from services/interface/src/parcel/accessibility_element_info_parcel.cpp rename to common/interface/src/parcel/accessibility_element_info_parcel.cpp diff --git a/services/interface/src/parcel/accessibility_event_info_parcel.cpp b/common/interface/src/parcel/accessibility_event_info_parcel.cpp similarity index 100% rename from services/interface/src/parcel/accessibility_event_info_parcel.cpp rename to common/interface/src/parcel/accessibility_event_info_parcel.cpp diff --git a/services/interface/src/parcel/accessibility_gesture_inject_path_parcel.cpp b/common/interface/src/parcel/accessibility_gesture_inject_path_parcel.cpp similarity index 100% rename from services/interface/src/parcel/accessibility_gesture_inject_path_parcel.cpp rename to common/interface/src/parcel/accessibility_gesture_inject_path_parcel.cpp diff --git a/services/interface/src/parcel/accessibility_window_info_parcel.cpp b/common/interface/src/parcel/accessibility_window_info_parcel.cpp similarity index 100% rename from services/interface/src/parcel/accessibility_window_info_parcel.cpp rename to common/interface/src/parcel/accessibility_window_info_parcel.cpp diff --git a/frameworks/aafwk/include/accessibility_ui_test_ability_impl.h b/frameworks/aafwk/include/accessibility_ui_test_ability_impl.h index 760f3d5f..4f893810 100644 --- a/frameworks/aafwk/include/accessibility_ui_test_ability_impl.h +++ b/frameworks/aafwk/include/accessibility_ui_test_ability_impl.h @@ -17,7 +17,7 @@ #define ACCESSIBILITY_UI_TEST_ABILITY_IMPL_H #include "accessibility_ui_test_ability.h" -#include "accessible_ability_manager_service_proxy.h" +#include "i_accessible_ability_manager_service.h" namespace OHOS { namespace Accessibility { @@ -237,7 +237,7 @@ public: virtual void SetCacheMode(const int32_t cacheMode) override; private: - sptr serviceProxy_ = nullptr; + sptr serviceProxy_ = nullptr; }; } // namespace Accessibility } // namespace OHOS diff --git a/frameworks/aafwk/src/accessibility_ui_test_ability_impl.cpp b/frameworks/aafwk/src/accessibility_ui_test_ability_impl.cpp index f52dbd12..a64c1a27 100644 --- a/frameworks/aafwk/src/accessibility_ui_test_ability_impl.cpp +++ b/frameworks/aafwk/src/accessibility_ui_test_ability_impl.cpp @@ -53,7 +53,7 @@ AccessibilityUITestAbilityImpl::AccessibilityUITestAbilityImpl() return; } - serviceProxy_ = iface_cast(object); + serviceProxy_ = iface_cast(object); if (!serviceProxy_) { HILOG_ERROR("Get aams proxy failed"); return; diff --git a/frameworks/aafwk/test/BUILD.gn b/frameworks/aafwk/test/BUILD.gn index dbd60392..a2dae2f0 100755 --- a/frameworks/aafwk/test/BUILD.gn +++ b/frameworks/aafwk/test/BUILD.gn @@ -107,8 +107,8 @@ ohos_unittest("accessible_ability_test") { deps = [ "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//foundation/arkui/napi:ace_napi", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] diff --git a/frameworks/asacfwk/test/BUILD.gn b/frameworks/asacfwk/test/BUILD.gn index 6a090316..afa0f91a 100644 --- a/frameworks/asacfwk/test/BUILD.gn +++ b/frameworks/asacfwk/test/BUILD.gn @@ -92,8 +92,8 @@ ohos_unittest("asac_unit_test") { deps = [ "//base/global/resource_management/frameworks/resmgr:global_resmgr", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", diff --git a/interfaces/innerkits/aafwk/BUILD.gn b/interfaces/innerkits/aafwk/BUILD.gn index 99db0291..2f42d070 100644 --- a/interfaces/innerkits/aafwk/BUILD.gn +++ b/interfaces/innerkits/aafwk/BUILD.gn @@ -50,7 +50,7 @@ ohos_shared_library("accessibleability") { deps = [ "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", ] external_deps = [ diff --git a/interfaces/innerkits/acfwk/BUILD.gn b/interfaces/innerkits/acfwk/BUILD.gn index 78f31307..147d2d33 100755 --- a/interfaces/innerkits/acfwk/BUILD.gn +++ b/interfaces/innerkits/acfwk/BUILD.gn @@ -45,9 +45,7 @@ ohos_shared_library("accessibilityconfig") { public_configs = [ ":accessibilityconfig_public_config" ] - deps = [ - "//foundation/barrierfree/accessibility/services/interface:aams_interface", - ] + deps = [ "//foundation/barrierfree/accessibility/common/interface:accessibility_interface" ] public_deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common" ] diff --git a/interfaces/innerkits/asacfwk/BUILD.gn b/interfaces/innerkits/asacfwk/BUILD.gn index b09577e1..380d09d4 100644 --- a/interfaces/innerkits/asacfwk/BUILD.gn +++ b/interfaces/innerkits/asacfwk/BUILD.gn @@ -45,9 +45,7 @@ ohos_shared_library("accessibilityclient") { public_configs = [ ":accessibilityclient_public_config" ] - deps = [ - "//foundation/barrierfree/accessibility/services/interface:aams_interface", - ] + deps = [ "//foundation/barrierfree/accessibility/common/interface:accessibility_interface" ] public_deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common" ] diff --git a/interfaces/kits/napi/BUILD.gn b/interfaces/kits/napi/BUILD.gn index aeaf0a82..456fc38b 100644 --- a/interfaces/kits/napi/BUILD.gn +++ b/interfaces/kits/napi/BUILD.gn @@ -39,11 +39,11 @@ ohos_shared_library("accessibility") { "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", "${ability_runtime_path}/frameworks/native/appkit:appkit_native", "//foundation/arkui/napi:ace_napi", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability", "//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk:accessibilityconfig", "//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk:accessibilityclient", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", ] external_deps = [ diff --git a/interfaces/kits/napi/accessibility_config/BUILD.gn b/interfaces/kits/napi/accessibility_config/BUILD.gn index fbd565c3..38feda1e 100644 --- a/interfaces/kits/napi/accessibility_config/BUILD.gn +++ b/interfaces/kits/napi/accessibility_config/BUILD.gn @@ -36,12 +36,12 @@ ohos_shared_library("config_napi") { "//foundation/ability/ability_runtime/frameworks/native/ability/native:abilitykit_native", "//foundation/ability/ability_runtime/frameworks/native/appkit:appkit_native", "//foundation/arkui/napi:ace_napi", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability", "//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk:accessibilityconfig", "//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk:accessibilityclient", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "//foundation/barrierfree/accessibility/interfaces/kits/napi:accessibility", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", ] external_deps = [ diff --git a/services/aams/BUILD.gn b/services/aams/BUILD.gn index 797e1c50..8f98ac5d 100755 --- a/services/aams/BUILD.gn +++ b/services/aams/BUILD.gn @@ -67,8 +67,8 @@ ohos_shared_library("accessibleabilityms") { configs = [ ":aams_service_config" ] deps = [ + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", ] external_deps = [ diff --git a/services/aams/test/BUILD.gn b/services/aams/test/BUILD.gn index 0f9798b1..b793cb74 100644 --- a/services/aams/test/BUILD.gn +++ b/services/aams/test/BUILD.gn @@ -97,9 +97,9 @@ ohos_unittest("accessibility_account_data_test") { "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/window/window_manager/utils:libwmutil", @@ -148,9 +148,9 @@ ohos_unittest("accessible_ability_manager_service_test") { "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/window/window_manager/utils:libwmutil", "//third_party/googletest:gmock_main", @@ -269,9 +269,9 @@ ohos_unittest("accessibility_common_event_registry_test") { "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/window/window_manager/utils:libwmutil", "//third_party/googletest:gmock_main", @@ -340,9 +340,9 @@ ohos_unittest("accessibility_input_interceptor_test") { "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/window/window_manager/utils:libwmutil", @@ -395,9 +395,9 @@ ohos_unittest("accessibility_window_manager_test") { "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/window/window_manager/utils:libwmutil", @@ -459,9 +459,9 @@ ohos_unittest("accessibility_keyevent_filter_test") { "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/window/window_manager/utils:libwmutil", "//third_party/googletest:gmock_main", @@ -538,8 +538,8 @@ ohos_unittest("accessible_ability_connection_test") { "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/window/window_manager/utils:libwmutil", @@ -581,7 +581,7 @@ ohos_unittest("accessibility_display_manager_test") { "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/window/window_manager/utils:libwmutil", "//third_party/googletest:gmock_main", @@ -627,9 +627,9 @@ ohos_unittest("accessibility_touchevent_injector_test") { "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/window/window_manager/utils:libwmutil", "//third_party/googletest:gmock_main", diff --git a/services/test/BUILD.gn b/services/test/BUILD.gn index f155ca3d..a6337295 100644 --- a/services/test/BUILD.gn +++ b/services/test/BUILD.gn @@ -129,8 +129,8 @@ ohos_moduletest("aams_accessibility_touch_guider_test") { deps = [ "//base/global/resource_management/frameworks/resmgr:global_resmgr", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", "//foundation/window/window_manager/utils:libwmutil", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -210,8 +210,8 @@ ohos_moduletest("aams_accessibility_touchEvent_injector_test") { deps = [ "//base/global/resource_management/frameworks/resmgr:global_resmgr", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", "//foundation/window/window_manager/utils:libwmutil", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -297,8 +297,8 @@ ohos_moduletest("aams_accessible_ability_channel_test") { deps = [ "//base/global/resource_management/frameworks/resmgr:global_resmgr", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", "//foundation/window/window_manager/utils:libwmutil", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -382,8 +382,8 @@ ohos_moduletest("aams_server_test") { deps = [ "//base/global/resource_management/frameworks/resmgr:global_resmgr", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", "//foundation/window/window_manager/utils:libwmutil", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -461,8 +461,8 @@ ohos_moduletest("aams_accessibility_keyevent_filter_test") { deps = [ "//base/global/resource_management/frameworks/resmgr:global_resmgr", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", "//foundation/window/window_manager/utils:libwmutil", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -546,8 +546,8 @@ ohos_moduletest("aams_common_event_registry_test") { deps = [ "//base/global/resource_management/frameworks/resmgr:global_resmgr", + "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/interface:aams_interface", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/window/window_manager/utils:libwmutil", "//third_party/googletest:gmock_main",