!91 aafwk绝对路径整改

Merge pull request !91 from 施其昌/master
This commit is contained in:
openharmony_ci
2022-05-24 08:35:09 +00:00
committed by Gitee
6 changed files with 40 additions and 15 deletions
+5 -4
View File
@@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/miscservices/request/request_aafwk.gni")
import("//build/lite/config/component/lite_component.gni")
import("//build/ohos.gni")
@@ -54,14 +55,14 @@ ohos_shared_library("downloaddataability") {
"//base/account/os_account/interfaces/innerkits/ohosaccount/native/include/",
"//base/account/os_account/interfaces/kits/napi/distributedaccount/include/",
"//base/account/os_account/interfaces/innerkits/include",
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
"//foundation/aafwk/standard/services/abilitymgr/include",
"//foundation/aafwk/standard/frameworks/kits/ability/native/include",
"${aafwk_inner_api_path}/ability_manager/include",
"${aafwk_services_path}/abilitymgr/include",
"${aafwk_kits_path}/ability/native/include",
"//base/miscservices/request/download/utils/include",
]
deps = [
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"${aafwk_kits_path}/ability/native:abilitykit_native",
"//foundation/arkui/napi:ace_napi",
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//third_party/jsoncpp:jsoncpp",
@@ -10,7 +10,9 @@
# 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.
import("//base/miscservices/request/request_aafwk.gni")
import("//build/ohos.gni")
config("download_interfaces_kits_napi_config") {
visibility = [ ":*" ]
include_dirs = [ "include" ]
@@ -25,15 +27,15 @@ ohos_shared_library("downloadsingle") {
"//foundation/arkui/napi/interfaces/inner_api",
"//third_party/node/src",
"//third_party/curl/include",
"//foundation/aafwk/standard/services/common/include",
"${aafwk_services_path}/common/include",
"//utils/system/safwk/native/include",
"//base/miscservices/request/download/interfaces/kits/napi/download_single/include",
"//base/miscservices/request/download/interfaces/innerkits/include",
"//base/miscservices/request/download/utils/include",
"//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include/",
"//foundation/aafwk/standard/frameworks/kits/ability/native/include",
"//foundation/aafwk/standard/services/abilitymgr/include",
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
"${aafwk_kits_path}/appkit/native/app/include/",
"${aafwk_kits_path}/ability/native/include",
"${aafwk_services_path}/abilitymgr/include",
"${aafwk_inner_api_path}/ability_manager/include",
]
public_configs = [ ":download_interfaces_kits_napi_config" ]
+18
View File
@@ -0,0 +1,18 @@
# 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_services_path = "//foundation/aafwk/standard/services"
+2 -1
View File
@@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/miscservices/request/request_aafwk.gni")
import("//build/ohos.gni")
config("upload_lib_config") {
@@ -54,7 +55,7 @@ ohos_shared_library("upload_lib") {
configs = [ ":upload_lib_config" ]
deps = [
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"${aafwk_kits_path}/ability/native:abilitykit_native",
"//third_party/curl/:curl",
]
+2 -1
View File
@@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/miscservices/request/request_aafwk.gni")
import("//build/ohos.gni")
config("upload_native_config") {
@@ -46,9 +47,9 @@ ohos_shared_library("request") {
configs = [ ":upload_native_config" ]
deps = [
"${aafwk_kits_path}/ability/native:abilitykit_native",
"//base/miscservices/request/download/interfaces/kits/js/napi/download_single:downloadsingle",
"//base/miscservices/request/upload/frameworks/libs:upload_lib",
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//foundation/arkui/napi/:ace_napi",
"//third_party/libuv:uv_static",
"//utils/native/base:utils",
+6 -4
View File
@@ -11,6 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/miscservices/request/request_aafwk.gni")
#import("//base/miscservices/request/upload/upload.gni")
import("//build/ohos.gni")
import("//build/test.gni")
@@ -34,8 +36,8 @@ ohos_unittest("upload_obtain_file_UT_test") {
]
deps = [
"${aafwk_kits_path}/ability/native:abilitykit_native",
"//base/miscservices/request/upload/frameworks/libs/:upload_lib",
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//third_party/googletest:gmock_main",
]
@@ -70,14 +72,14 @@ ohos_unittest("upload_UT_test") {
"//foundation/communication/dsoftbus/interfaces/kits/common",
"//foundation/communication/dsoftbus/interfaces/kits/bus_center",
"//third_party/json/include",
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
"${aafwk_inner_api_path}/ability_manager/include",
"//third_party/curl/include",
]
deps = [
"${aafwk_kits_path}/ability/native:abilitykit_native",
"${aafwk_kits_path}/appkit:app_context",
"//base/miscservices/request/upload/frameworks/libs/:upload_lib",
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
"//third_party/curl/:curl",
"//utils/native/base:utils",
]