aafwk绝对路径整改

Signed-off-by: shiqichang <shiqichang@huawei.com>
Change-Id: I3c98df4839510623b75eafda12dd9e0d6775ab03
This commit is contained in:
shiqichang 2022-05-19 20:22:26 +08:00
parent 3b1127113e
commit fa89f58403
6 changed files with 51 additions and 28 deletions

17
accessibility_aafwk.gni Normal file
View File

@ -0,0 +1,17 @@
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
aafwk_inner_api_path = "//foundation/aafwk/standard/interfaces/innerkits"
aafwk_kits_path = "//foundation/aafwk/standard/frameworks/kits"
aafwk_path = "//foundation/aafwk/standard"
aafwk_services_path = "//foundation/aafwk/standard/services"

View File

@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/accessibility/accessibility_aafwk.gni")
import("//build/ohos.gni")
aafwk_path = "//base/accessibility/frameworks/aafwk"
@ -48,8 +49,8 @@ ohos_shared_library("accessibleability") {
public_configs = [ ":accessibleability_public_config" ]
deps = [
"${aafwk_kits_path}/ability/native:abilitykit_native",
"//base/accessibility/services/interface:aams_interface",
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
]
external_deps = [

View File

@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/accessibility/accessibility_aafwk.gni")
import("//build/ohos.gni")
ohos_shared_library("accessibility") {
@ -48,14 +49,14 @@ ohos_shared_library("accessibility") {
configs = []
deps = [
"${aafwk_kits_path}/ability/native:abilitykit_native",
"${aafwk_kits_path}/appkit:appkit_native",
"//base/accessibility/interfaces/innerkits/aafwk:accessibleability",
"//base/accessibility/interfaces/innerkits/acfwk:accessibilityconfig",
"//base/accessibility/interfaces/innerkits/acfwk:accessibilityconfig",
"//base/accessibility/interfaces/innerkits/asacfwk:accessibilityclient",
"//base/accessibility/interfaces/innerkits/common:accessibility_common",
"//base/accessibility/services/interface:aams_interface",
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
"//foundation/arkui/napi:ace_napi",
"//utils/native/base:utils",
]

View File

@ -43,11 +43,11 @@ config("module_private_config") {
"//base/notification/common_event_service/interfaces/inner_api",
"//base/powermgr/power_manager/interfaces/innerkits/native/include",
"//foundation",
"//foundation/aafwk/standard/frameworks/kits/ability/native/include/",
"//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include/",
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
"//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr/",
"//foundation/aafwk/standard/services/abilitymgr/include",
"${aafwk_kits_path}/ability/native/include/",
"${aafwk_kits_path}/appkit/native/app/include/",
"${aafwk_inner_api_path}/ability_manager/include",
"${aafwk_inner_api_path}/app_manager/include/appmgr/",
"${aafwk_services_path}/abilitymgr/include",
"//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
"//foundation/distributedschedule/samgr/interfaces/innerkits/common/include",
@ -92,13 +92,13 @@ ohos_unittest("accessibility_account_data_test") {
configs = [ ":module_private_config" ]
deps = [
"${aafwk_inner_api_path}/ability_manager:ability_manager",
"${aafwk_kits_path}/ability/native:abilitykit_native",
"//base/accessibility/interfaces/innerkits/common:accessibility_common",
"//base/accessibility/services/aams:accessibleabilityms",
"//base/accessibility/services/interface:aams_interface",
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//foundation/windowmanager/utils:libwmutil",
@ -143,12 +143,12 @@ ohos_unittest("accessible_ability_manager_service_test") {
configs = [ ":module_private_config" ]
deps = [
"${aafwk_kits_path}/ability/native:abilitykit_native",
"//base/accessibility/interfaces/innerkits/common:accessibility_common",
"//base/accessibility/services/aams:accessibleabilityms",
"//base/accessibility/services/interface:aams_interface",
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//foundation/windowmanager/utils:libwmutil",
"//third_party/googletest:gmock_main",
@ -206,10 +206,10 @@ ohos_unittest("accessibility_touch_guider_test") {
configs = [ ":module_private_config" ]
deps = [
"${aafwk_kits_path}/ability/native:abilitykit_native",
"//base/accessibility/interfaces/innerkits/common:accessibility_common",
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//foundation/windowmanager/utils:libwmutil",
"//third_party/googletest:gmock_main",
@ -258,12 +258,12 @@ ohos_unittest("accessibility_common_event_registry_test") {
configs = [ ":module_private_config" ]
deps = [
"${aafwk_kits_path}/ability/native:abilitykit_native",
"//base/accessibility/interfaces/innerkits/common:accessibility_common",
"//base/accessibility/services/aams:accessibleabilityms",
"//base/accessibility/services/interface:aams_interface",
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//foundation/windowmanager/utils:libwmutil",
"//third_party/googletest:gmock_main",
@ -324,13 +324,13 @@ ohos_unittest("accessibility_input_interceptor_test") {
configs = [ ":module_private_config" ]
deps = [
"${aafwk_inner_api_path}/ability_manager:ability_manager",
"${aafwk_kits_path}/ability/native:abilitykit_native",
"//base/accessibility/interfaces/innerkits/common:accessibility_common",
"//base/accessibility/services/aams:accessibleabilityms",
"//base/accessibility/services/interface:aams_interface",
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//foundation/windowmanager/utils:libwmutil",
@ -378,13 +378,13 @@ ohos_unittest("accessibility_window_manager_test") {
configs = [ ":module_private_config" ]
deps = [
"${aafwk_inner_api_path}/ability_manager:ability_manager",
"${aafwk_kits_path}/ability/native:abilitykit_native",
"//base/accessibility/interfaces/innerkits/common:accessibility_common",
"//base/accessibility/services/aams:accessibleabilityms",
"//base/accessibility/services/interface:aams_interface",
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//foundation/windowmanager/utils:libwmutil",
@ -439,12 +439,12 @@ ohos_unittest("accessibility_keyevent_filter_test") {
configs = [ ":module_private_config" ]
deps = [
"${aafwk_kits_path}/ability/native:abilitykit_native",
"//base/accessibility/interfaces/innerkits/common:accessibility_common",
"//base/accessibility/services/aams:accessibleabilityms",
"//base/accessibility/services/interface:aams_interface",
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//foundation/windowmanager/utils:libwmutil",
"//third_party/googletest:gmock_main",
@ -513,11 +513,11 @@ ohos_unittest("accessible_ability_connection_test") {
configs = [ ":module_private_config" ]
deps = [
"${aafwk_kits_path}/ability/native:abilitykit_native",
"//base/accessibility/interfaces/innerkits/common:accessibility_common",
"//base/accessibility/services/interface:aams_interface",
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//foundation/windowmanager/utils:libwmutil",
@ -555,10 +555,10 @@ ohos_unittest("accessibility_display_manager_test") {
configs = [ ":module_private_config" ]
deps = [
"${aafwk_kits_path}/ability/native:abilitykit_native",
"//base/accessibility/services/interface:aams_interface",
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//foundation/windowmanager/utils:libwmutil",
"//third_party/googletest:gmock_main",
@ -601,12 +601,12 @@ ohos_unittest("accessibility_touchevent_injector_test") {
configs = [ ":module_private_config" ]
deps = [
"${aafwk_kits_path}/ability/native:abilitykit_native",
"//base/accessibility/interfaces/innerkits/common:accessibility_common",
"//base/accessibility/services/aams:accessibleabilityms",
"//base/accessibility/services/interface:aams_interface",
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//foundation/windowmanager/utils:libwmutil",
"//third_party/googletest:gmock_main",

View File

@ -42,13 +42,13 @@ config("module_private_config") {
"//base/global/resource_management/interfaces/inner_api/include",
"//base/notification/common_event_service/interfaces/inner_api",
"//foundation",
"//foundation/aafwk/standard/frameworks/kits/ability/native/include/",
"//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime",
"//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context",
"//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include/",
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
"//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
"//foundation/aafwk/standard/services/abilitymgr/include",
"${aafwk_kits_path}/ability/native/include/",
"${aafwk_kits_path}/appkit/native/ability_runtime",
"${aafwk_kits_path}/appkit/native/ability_runtime/context",
"${aafwk_kits_path}/appkit/native/app/include/",
"${aafwk_inner_api_path}/ability_manager/include",
"${aafwk_inner_api_path}/app_manager/include/appmgr",
"${aafwk_services_path}/abilitymgr/include",
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
"//foundation/graphic/graphic/rosen/modules/render_service_base/include",

View File

@ -11,6 +11,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
aafwk_inner_api_path = "//foundation/aafwk/standard/interfaces/innerkits"
aafwk_kits_path = "//foundation/aafwk/standard/frameworks/kits"
aafwk_path = "//foundation/aafwk/standard"
aafwk_services_path = "//foundation/aafwk/standard/services"
AAMS_MOCK_PATH = "//base/accessibility/services/test/mock"
aams_mock_include_dirs = [