aafwk绝对路径整改

Signed-off-by: shiqichang <shiqichang@huawei.com>
Change-Id: I1a65387ac2fb3ffc511b7d052698da09e3d50da3
This commit is contained in:
shiqichang 2022-05-19 10:30:40 +08:00
parent a2ad94fba5
commit 0f5759f20b
3 changed files with 8 additions and 12 deletions

View File

@ -20,9 +20,7 @@ if (defined(ohos_lite)) {
} }
group("wifi_kits") { group("wifi_kits") {
deps = [ deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk" ]
"$WIFI_ROOT_DIR/frameworks/native:wifi_sdk",
]
if (!defined(ohos_lite)) { if (!defined(ohos_lite)) {
deps += [ deps += [
"$WIFI_ROOT_DIR/frameworks/js/napi:wifi", "$WIFI_ROOT_DIR/frameworks/js/napi:wifi",

View File

@ -26,7 +26,7 @@ ohos_shared_library("wifi") {
"//base/security/access_token/interfaces/innerkits/accesstoken/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include",
"$WIFI_ROOT_DIR/frameworks/native/include", "$WIFI_ROOT_DIR/frameworks/native/include",
"$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
"${aakits_path}/appkit/native/ability_runtime/context", "${aafwk_kits_path}/appkit/native/ability_runtime/context",
"$WIFI_ROOT_DIR/utils/inc", "$WIFI_ROOT_DIR/utils/inc",
"$WIFI_ROOT_DIR/frameworks/js/napi/inc", "$WIFI_ROOT_DIR/frameworks/js/napi/inc",
] ]
@ -42,7 +42,7 @@ ohos_shared_library("wifi") {
deps = [ deps = [
"$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk",
"$WIFI_ROOT_DIR/utils/src:wifi_utils", "$WIFI_ROOT_DIR/utils/src:wifi_utils",
"${aakits_path}/appkit:app_context", "${aafwk_kits_path}/appkit:app_context",
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/arkui/napi:ace_napi", "//foundation/arkui/napi:ace_napi",
"//utils/native/base:utils", "//utils/native/base:utils",
@ -86,8 +86,8 @@ ohos_shared_library("wifiext") {
] ]
external_deps = [ external_deps = [
"bundle_framework:appexecfwk_base",
"access_token:libaccesstoken_sdk", "access_token:libaccesstoken_sdk",
"bundle_framework:appexecfwk_base",
"ipc:ipc_core", "ipc:ipc_core",
] ]
@ -109,7 +109,7 @@ ohos_shared_library("wifi_native_js") {
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"//base/security/access_token/interfaces/innerkits/accesstoken/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include",
"$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
"${aakits_path}/appkit/native/ability_runtime/context", "${aafwk_kits_path}/appkit/native/ability_runtime/context",
"$WIFI_ROOT_DIR/utils/inc", "$WIFI_ROOT_DIR/utils/inc",
] ]
@ -124,7 +124,7 @@ ohos_shared_library("wifi_native_js") {
deps = [ deps = [
"$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk",
"$WIFI_ROOT_DIR/utils/src:wifi_utils", "$WIFI_ROOT_DIR/utils/src:wifi_utils",
"${aakits_path}/appkit:app_context", "${aafwk_kits_path}/appkit:app_context",
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/arkui/napi:ace_napi", "//foundation/arkui/napi:ace_napi",
"//utils/native/base:utils", "//utils/native/base:utils",
@ -133,8 +133,8 @@ ohos_shared_library("wifi_native_js") {
defines = [ "ENABLE_NAPI_COMPATIBLE" ] defines = [ "ENABLE_NAPI_COMPATIBLE" ]
external_deps = [ external_deps = [
"bundle_framework:appexecfwk_base",
"access_token:libaccesstoken_sdk", "access_token:libaccesstoken_sdk",
"bundle_framework:appexecfwk_base",
"ipc:ipc_core", "ipc:ipc_core",
] ]

View File

@ -11,9 +11,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
aaservices_path = "//foundation/aafwk/standard/services" aafwk_kits_path = "//foundation/aafwk/standard/frameworks/kits"
aainnerkits_path = "//foundation/aafwk/standard/interfaces/innerkits"
aakits_path = "//foundation/aafwk/standard/frameworks/kits"
SUBSYSTEM_DIR = "//foundation/communication" SUBSYSTEM_DIR = "//foundation/communication"
WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi" WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi"