aafwk绝对路径整改

Signed-off-by: shiqichang <shiqichang@huawei.com>
Change-Id: Ifce8cd0a271952b873f516b1ce8851c2dab64347
This commit is contained in:
shiqichang 2022-05-18 14:13:53 +08:00
parent c30cc1af02
commit 5a6252ea58
8 changed files with 45 additions and 36 deletions

View File

@ -12,8 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
aakits_path = "//foundation/aafwk/standard/frameworks/kits"
import("//foundation/windowmanager/windowmanager_aafwk.gni")
config("libwindow_extension_private_config") {
visibility = [ ":*" ]
@ -71,7 +70,7 @@ config("window_extension_module_private_config") {
include_dirs = [
"include",
"${aakits_path}/ability/ability_runtime/include",
"${aafwk_kits_path}/ability/ability_runtime/include",
]
}

View File

@ -12,8 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
aakits_path = "//foundation/aafwk/standard/frameworks/kits"
import("//foundation/windowmanager/windowmanager_aafwk.gni")
config("display_config") {
visibility = [ ":*" ]
@ -36,9 +35,9 @@ ohos_shared_library("display_napi") {
configs = [ ":display_config" ]
deps = [
"${aakits_path}/ability/native:abilitykit_native",
"${aakits_path}/appkit:app_context",
"${aakits_path}/appkit:appkit_native",
"${aafwk_kits_path}/ability/native:abilitykit_native",
"${aafwk_kits_path}/appkit:app_context",
"${aafwk_kits_path}/appkit:appkit_native",
"../common:wm_napi_common",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/dm:libdm",

View File

@ -13,8 +13,7 @@
import("//ark/ts2abc/ts2panda/ts2abc_config.gni")
import("//build/ohos.gni")
aakits_path = "//foundation/aafwk/standard/frameworks/kits"
import("//foundation/windowmanager/windowmanager_aafwk.gni")
config("screen_runtime_config") {
visibility = [ ":*" ]
@ -38,9 +37,9 @@ ohos_shared_library("screen_napi") {
configs = [ ":screen_runtime_config" ]
deps = [
"${aakits_path}/ability/native:abilitykit_native",
"${aakits_path}/appkit:app_context",
"${aakits_path}/appkit:appkit_native",
"${aafwk_kits_path}/ability/native:abilitykit_native",
"${aafwk_kits_path}/appkit:app_context",
"${aafwk_kits_path}/appkit:appkit_native",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/dmserver:libdms",

View File

@ -13,8 +13,7 @@
import("//ark/ts2abc/ts2panda/ts2abc_config.gni")
import("//build/ohos.gni")
aakits_path = "//foundation/aafwk/standard/frameworks/kits"
import("//foundation/windowmanager/windowmanager_aafwk.gni")
config("window_manager_napi_config") {
visibility = [ ":*" ]
@ -78,9 +77,9 @@ ohos_shared_library("window_napi") {
configs = [ ":window_manager_napi_config" ]
deps = [
":window_native_kit",
"${aakits_path}/ability/native:abilitykit_native",
"${aakits_path}/appkit:app_context",
"${aakits_path}/appkit:appkit_native",
"${aafwk_kits_path}/ability/native:abilitykit_native",
"${aafwk_kits_path}/appkit:app_context",
"${aafwk_kits_path}/appkit:appkit_native",
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wmserver:libwms",

17
windowmanager_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

@ -12,9 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
aainnerkits_path = "//foundation/aafwk/standard/interfaces/innerkits"
aakits_path = "//foundation/aafwk/standard/frameworks/kits"
import("//foundation/windowmanager/windowmanager_aafwk.gni")
config("libwm_private_config") {
visibility = [ ":*" ]
@ -22,9 +20,9 @@ config("libwm_private_config") {
include_dirs = [
"include",
"../wmserver/include",
"${aakits_path}/ability/ability_runtime/include",
"${aainnerkits_path}/ability_manager/include",
"${aainnerkits_path}/app_manager/include/appmgr",
"${aafwk_kits_path}/ability/ability_runtime/include",
"${aafwk_inner_api_path}/ability_manager/include",
"${aafwk_inner_api_path}/app_manager/include/appmgr",
"//third_party/jsoncpp/include",
"//third_party/json/include",
]

View File

@ -12,10 +12,9 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/windowmanager/windowmanager_aafwk.gni")
module_out_path = "window_manager/wm"
aainnerkits_path = "//foundation/aafwk/standard/interfaces/innerkits"
aakits_path = "//foundation/aafwk/standard/frameworks/kits"
group("systemtest") {
testonly = true
@ -221,11 +220,11 @@ config("wm_systemtest_common_public_config") {
"//third_party/googletest/googlemock/include",
# for abilityContext
"${aakits_path}/ability/ability_runtime/include",
"${aakits_path}/appkit/native/ability_runtime/context",
"${aafwk_kits_path}/ability/ability_runtime/include",
"${aafwk_kits_path}/appkit/native/ability_runtime/context",
"//base/global/resource_management/interfaces/inner_api/include",
"//third_party/node/deps/icu-small/source/common",
"${aainnerkits_path}/ability_manager/include",
"${aafwk_inner_api_path}/ability_manager/include",
"//third_party/jsoncpp/include",
"//third_party/json/include",
@ -254,7 +253,7 @@ ohos_static_library("wm_systemtest_common") {
"//foundation/arkui/ace_engine/interfaces/inner_api/ace:ace_uicontent",
# need delete it for abilitycontext
"${aainnerkits_path}/ability_manager:ability_manager",
"${aafwk_inner_api_path}/ability_manager:ability_manager",
"//foundation/arkui/napi:ace_napi",
"//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
"//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",

View File

@ -12,9 +12,8 @@
# limitations under the License.
import("//build/test.gni")
import("//foundation/windowmanager/windowmanager_aafwk.gni")
module_out_path = "window_manager/wm"
aainnerkits_path = "//foundation/aafwk/standard/interfaces/innerkits"
aakits_path = "//foundation/aafwk/standard/frameworks/kits"
group("unittest") {
testonly = true
@ -145,11 +144,11 @@ config("wm_unittest_common_public_config") {
"//third_party/googletest/googlemock/include",
# for abilityContext
"${aakits_path}/ability/ability_runtime/include",
"${aakits_path}/appkit/native/ability_runtime/context",
"${aafwk_kits_path}/ability/ability_runtime/include",
"${aafwk_kits_path}/appkit/native/ability_runtime/context",
"//base/global/resource_management/interfaces/inner_api/include",
"//third_party/node/deps/icu-small/source/common",
"${aainnerkits_path}/ability_manager/include",
"${aafwk_inner_api_path}/ability_manager/include",
"//third_party/jsoncpp/include",
"//third_party/json/include",
@ -175,7 +174,7 @@ ohos_static_library("wm_unittest_common") {
"//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
# need delete it for abilitycontext
"${aainnerkits_path}/ability_manager:ability_manager",
"${aafwk_inner_api_path}/ability_manager:ability_manager",
"//foundation/arkui/ace_engine/interfaces/inner_api/ace:ace_uicontent",
"//foundation/arkui/napi:ace_napi",
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",