From e9235d8140968b6ca02cea316e8e4088512d26e2 Mon Sep 17 00:00:00 2001 From: shiqichang Date: Fri, 20 May 2022 11:17:02 +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: I43370a3bccfdd3969accea72a74cf26bb0694b6c --- frameworks/ans/native/BUILD.gn | 2 +- interfaces/kits/napi/ans/BUILD.gn | 2 +- interfaces/kits/napi/ans/src/reminder/BUILD.gn | 2 +- notification.gni | 6 ++++++ test/common/acts/actsnotificationfuzztest/BUILD.gn | 12 ++++++------ test/fuzztest/addslotbytype_fuzzer/BUILD.gn | 3 ++- test/fuzztest/removenotification_fuzzer/BUILD.gn | 3 ++- test/resource/ansSTSlotGroupTest/BUILD.gn | 6 +++--- tools/dump/BUILD.gn | 2 +- 9 files changed, 23 insertions(+), 15 deletions(-) diff --git a/frameworks/ans/native/BUILD.gn b/frameworks/ans/native/BUILD.gn index 17e50e5b8..377a47e06 100644 --- a/frameworks/ans/native/BUILD.gn +++ b/frameworks/ans/native/BUILD.gn @@ -30,7 +30,7 @@ config("ans_innerkits_public_config") { "//utils/system/safwk/native/include", ] configs = [ - "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits_public_config", + "${aafwk_kits_path}/wantagent:wantagent_innerkits_public_config", "//foundation/multimedia/image_standard/interfaces/innerkits:image_external_config", ] } diff --git a/interfaces/kits/napi/ans/BUILD.gn b/interfaces/kits/napi/ans/BUILD.gn index 28bb47465..363677214 100644 --- a/interfaces/kits/napi/ans/BUILD.gn +++ b/interfaces/kits/napi/ans/BUILD.gn @@ -33,7 +33,7 @@ config("native_module_config") { ohos_shared_library("notification") { include_dirs = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native/include", + "${aafwk_kits_path}/ability/native/include", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common", "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/", "include", diff --git a/interfaces/kits/napi/ans/src/reminder/BUILD.gn b/interfaces/kits/napi/ans/src/reminder/BUILD.gn index 481065433..870b90f02 100644 --- a/interfaces/kits/napi/ans/src/reminder/BUILD.gn +++ b/interfaces/kits/napi/ans/src/reminder/BUILD.gn @@ -33,7 +33,7 @@ config("native_module_config") { ohos_shared_library("reminderagent") { include_dirs = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native/include", + "${aafwk_kits_path}/ability/native/include", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common", "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/", "../../include", diff --git a/notification.gni b/notification.gni index 6d9434f62..a74487dab 100644 --- a/notification.gni +++ b/notification.gni @@ -11,6 +11,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +aafwk_inner_api_path = "//foundation/aafwk/standard/interfaces/innerkits" + +aafwk_services_path = "//foundation/aafwk/standard/services" + +aafwk_kits_path = "//foundation/aafwk/standard/frameworks/kits" + ans_standard_path = "//base/notification/ans_standard" services_path = "${ans_standard_path}/services" diff --git a/test/common/acts/actsnotificationfuzztest/BUILD.gn b/test/common/acts/actsnotificationfuzztest/BUILD.gn index 6a5f25374..41064f0cf 100644 --- a/test/common/acts/actsnotificationfuzztest/BUILD.gn +++ b/test/common/acts/actsnotificationfuzztest/BUILD.gn @@ -35,11 +35,11 @@ ohos_systemtest("ActsNotificationFuzzTest") { "//base/notification/ans_standard/interfaces/innerkits/ans/native/include", "//base/notification/ans_standard/services/ans/include", "//third_party/json/single_include", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/frameworks/kits/ability/native/include", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_inner_api_path}/ability_manager/include", + "${aafwk_kits_path}/ability/native/include", + "${aafwk_services_path}/abilitymgr/include", "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include", - "//foundation/aafwk/standard/frameworks/kits/app/native/app/include/task", + "${aafwk_kits_path}/app/native/app/include/task", ] cflags = [] @@ -49,13 +49,13 @@ ohos_systemtest("ActsNotificationFuzzTest") { } deps = [ + "${aafwk_kits_path}/appkit:appkit_native", + "${aafwk_services_path}/abilitymgr:abilityms", "//base/global/resource_management/frameworks/resmgr:global_resmgr", "//base/notification/ans_standard/frameworks/ans/core:ans_core", "//base/notification/ans_standard/frameworks/ans/native:ans_innerkits", "//base/notification/ans_standard/frameworks/wantagent:native_wantagent", "//base/notification/ans_standard/services/ans:ans_targets", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/test/fuzztest/addslotbytype_fuzzer/BUILD.gn b/test/fuzztest/addslotbytype_fuzzer/BUILD.gn index 7fefb92e5..a93b2fc45 100644 --- a/test/fuzztest/addslotbytype_fuzzer/BUILD.gn +++ b/test/fuzztest/addslotbytype_fuzzer/BUILD.gn @@ -20,7 +20,8 @@ module_output_path = "ans_standard/services" ##############################fuzztest########################################## ohos_fuzztest("AddSlotByTypeFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/notification/ans_standard/test/fuzztest/addslotbytype_fuzzer" + fuzz_config_file = + "//base/notification/ans_standard/test/fuzztest/addslotbytype_fuzzer" include_dirs = [] cflags = [ diff --git a/test/fuzztest/removenotification_fuzzer/BUILD.gn b/test/fuzztest/removenotification_fuzzer/BUILD.gn index 8f12f91db..224029d91 100644 --- a/test/fuzztest/removenotification_fuzzer/BUILD.gn +++ b/test/fuzztest/removenotification_fuzzer/BUILD.gn @@ -20,7 +20,8 @@ module_output_path = "ans_standard/services" ##############################fuzztest########################################## ohos_fuzztest("RemoveNotificationFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/notification/ans_standard/test/fuzztest/removenotification_fuzzer" + fuzz_config_file = + "//base/notification/ans_standard/test/fuzztest/removenotification_fuzzer" include_dirs = [] cflags = [ diff --git a/test/resource/ansSTSlotGroupTest/BUILD.gn b/test/resource/ansSTSlotGroupTest/BUILD.gn index 43f672940..fa3ea9f57 100644 --- a/test/resource/ansSTSlotGroupTest/BUILD.gn +++ b/test/resource/ansSTSlotGroupTest/BUILD.gn @@ -26,8 +26,8 @@ config("ansSTSlotGroupTestConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/services/abilitymgr/include", + "${aafwk_kits_path}/appkit/native/app", + "${aafwk_services_path}/abilitymgr/include", "${interfaces_path}/innerkits/ans/native/include", ] @@ -43,9 +43,9 @@ ohos_shared_library("libraryAnsSTSlotGroupTest") { configs = [ ":ansSTSlotGroupTestConfig" ] deps = [ + "${aafwk_kits_path}/appkit:appkit_native", "${core_path}:ans_core", "${frameworks_path}/ans/native:ans_innerkits", - "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//utils/native/base:utilsbase", ] diff --git a/tools/dump/BUILD.gn b/tools/dump/BUILD.gn index 0d583b0bd..dec10b22e 100644 --- a/tools/dump/BUILD.gn +++ b/tools/dump/BUILD.gn @@ -39,7 +39,7 @@ ohos_executable("anm") { configs = [ "${core_path}:public_ans_core_config", - "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits_public_config", + "${aafwk_kits_path}/wantagent:wantagent_innerkits_public_config", ] defines = [] -- Gitee