From dbc47b972906b509aea202fcb3e8907ea0e3e609 Mon Sep 17 00:00:00 2001 From: shiqichang Date: Fri, 20 May 2022 10:19:15 +0800 Subject: [PATCH] =?UTF-8?q?aafwk=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shiqichang Change-Id: I0f061763b92be2492a6f1dadf129f90e25e4f7fc --- download/ability/BUILD.gn | 9 +++++---- .../kits/js/napi/download_single/BUILD.gn | 12 +++++++----- request_aafwk.gni | 18 ++++++++++++++++++ upload/frameworks/libs/BUILD.gn | 3 ++- upload/interfaces/kits/napi/BUILD.gn | 3 ++- upload/unitest/BUILD.gn | 10 ++++++---- 6 files changed, 40 insertions(+), 15 deletions(-) create mode 100644 request_aafwk.gni diff --git a/download/ability/BUILD.gn b/download/ability/BUILD.gn index 434babe..c77baf4 100644 --- a/download/ability/BUILD.gn +++ b/download/ability/BUILD.gn @@ -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", diff --git a/download/interfaces/kits/js/napi/download_single/BUILD.gn b/download/interfaces/kits/js/napi/download_single/BUILD.gn index 0079708..7e80fa5 100644 --- a/download/interfaces/kits/js/napi/download_single/BUILD.gn +++ b/download/interfaces/kits/js/napi/download_single/BUILD.gn @@ -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" ] diff --git a/request_aafwk.gni b/request_aafwk.gni new file mode 100644 index 0000000..8a0ffba --- /dev/null +++ b/request_aafwk.gni @@ -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" diff --git a/upload/frameworks/libs/BUILD.gn b/upload/frameworks/libs/BUILD.gn index 4fe9385..a98e2e5 100644 --- a/upload/frameworks/libs/BUILD.gn +++ b/upload/frameworks/libs/BUILD.gn @@ -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", ] diff --git a/upload/interfaces/kits/napi/BUILD.gn b/upload/interfaces/kits/napi/BUILD.gn index 25da490..e4ac93d 100644 --- a/upload/interfaces/kits/napi/BUILD.gn +++ b/upload/interfaces/kits/napi/BUILD.gn @@ -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", diff --git a/upload/unitest/BUILD.gn b/upload/unitest/BUILD.gn index ccb5473..4fe2013 100644 --- a/upload/unitest/BUILD.gn +++ b/upload/unitest/BUILD.gn @@ -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", ]