From 93f82bb60945320b973d63d235a3bf3edebebd41 Mon Sep 17 00:00:00 2001 From: zhoushicheng Date: Mon, 20 Jun 2022 16:47:57 +0800 Subject: [PATCH 1/4] aafwk->ability_runtime Signed-off-by: zhoushicheng Change-Id: I45b5af907161df19fb9bf5c550fa0c2c41173c8f --- frameworks/js/napi/BUILD.gn | 2 +- notification.gni | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn index 46467c8bc..edc507fae 100644 --- a/frameworks/js/napi/BUILD.gn +++ b/frameworks/js/napi/BUILD.gn @@ -72,7 +72,7 @@ ohos_shared_library("notification") { ] deps = [ - "${aafwk_path}/frameworks/kits/appkit:app_context", + "${ability_runtime_path}/frameworks/kits/appkit:app_context", "${core_path}:ans_core", "${frameworks_module_ans_path}:ans_innerkits", "//foundation/ability/ability_runtime/frameworks/js/napi/aafwk/inner/napi_common:napi_common", diff --git a/notification.gni b/notification.gni index fd49ed488..9bbc4ebab 100644 --- a/notification.gni +++ b/notification.gni @@ -25,7 +25,7 @@ inner_api_path = "${interfaces_path}/inner_api" core_path = "${frameworks_path}/core" test_path = "${component_path}/test" tools_path = "${component_path}/tools" -aafwk_path = "//foundation/ability/ability_runtime" +ability_runtime_path = "//foundation/ability/ability_runtime" distributed_notification_supported = true subsystem_name = "notification" component_external_deps = [ -- Gitee From e1965516d7fdac31bfe5b9987169b118b2db720f Mon Sep 17 00:00:00 2001 From: zhoushicheng Date: Thu, 23 Jun 2022 14:07:31 +0800 Subject: [PATCH 2/4] aafwk->ability_runtime Signed-off-by: zhoushicheng Change-Id: I8a27ad615dfc7469063b0d379751b8663c956425 --- frameworks/ans/BUILD.gn | 2 +- frameworks/js/napi/BUILD.gn | 6 +++--- frameworks/js/napi/src/reminder/BUILD.gn | 6 +++--- frameworks/test/moduletest/BUILD.gn | 2 +- notification.gni | 11 ++++++----- test/common/acts/actsnotificationfuzztest/BUILD.gn | 12 ++++++------ test/resource/ansSTSlotGroupTest/BUILD.gn | 6 +++--- tools/dump/BUILD.gn | 2 +- 8 files changed, 24 insertions(+), 23 deletions(-) diff --git a/frameworks/ans/BUILD.gn b/frameworks/ans/BUILD.gn index 2b0223144..004a72ec4 100644 --- a/frameworks/ans/BUILD.gn +++ b/frameworks/ans/BUILD.gn @@ -30,7 +30,7 @@ config("ans_innerkits_public_config") { "//utils/system/safwk/native/include", ] configs = [ - "${aafwk_kits_path}/wantagent:wantagent_innerkits_public_config", + "${ability_runtime_kits_path}/wantagent:wantagent_innerkits_public_config", "//foundation/multimedia/image_standard/interfaces/innerkits:image_external_config", ] } diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn index edc507fae..d6cd347ed 100644 --- a/frameworks/js/napi/BUILD.gn +++ b/frameworks/js/napi/BUILD.gn @@ -41,8 +41,8 @@ config("native_module_config") { ohos_shared_library("notification") { include_dirs = [ - "${aafwk_kits_path}/ability/native/include", - "//foundation/ability/ability_runtime/frameworks/js/napi/aafwk/inner/napi_common", + "${ability_runtime_kits_path}/ability/native/include", + "${ability_runtime_napi_path}/inner/napi_common", "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/", "include", "//third_party/node/src", @@ -75,7 +75,7 @@ ohos_shared_library("notification") { "${ability_runtime_path}/frameworks/kits/appkit:app_context", "${core_path}:ans_core", "${frameworks_module_ans_path}:ans_innerkits", - "//foundation/ability/ability_runtime/frameworks/js/napi/aafwk/inner/napi_common:napi_common", + "${ability_runtime_napi_path}/inner/napi_common:napi_common", "//foundation/multimedia/image_standard/interfaces/innerkits:image", "//third_party/jsoncpp:jsoncpp", "//third_party/libuv:uv_static", diff --git a/frameworks/js/napi/src/reminder/BUILD.gn b/frameworks/js/napi/src/reminder/BUILD.gn index 3370adb72..d82f7ba49 100644 --- a/frameworks/js/napi/src/reminder/BUILD.gn +++ b/frameworks/js/napi/src/reminder/BUILD.gn @@ -33,8 +33,8 @@ config("native_module_config") { ohos_shared_library("reminderagent") { include_dirs = [ - "${aafwk_kits_path}/ability/native/include", - "//foundation/ability/ability_runtime/frameworks/js/napi/aafwk/inner/napi_common", + "${ability_runtime_kits_path}/ability/native/include", + "${ability_runtime_napi_path}/inner/napi_common", "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/", "../../include", "//third_party/node/src", @@ -55,7 +55,7 @@ ohos_shared_library("reminderagent") { deps = [ "${core_path}:ans_core", "${frameworks_module_ans_path}:ans_innerkits", - "//foundation/ability/ability_runtime/frameworks/js/napi/aafwk/inner/napi_common:napi_common", + "${ability_runtime_napi_path}/inner/napi_common:napi_common", "//foundation/multimedia/image_standard/interfaces/innerkits:image", "//third_party/jsoncpp:jsoncpp", "//third_party/libuv:uv_static", diff --git a/frameworks/test/moduletest/BUILD.gn b/frameworks/test/moduletest/BUILD.gn index 5f73269a6..824ef82f6 100644 --- a/frameworks/test/moduletest/BUILD.gn +++ b/frameworks/test/moduletest/BUILD.gn @@ -139,7 +139,7 @@ ohos_moduletest("ans_innerkits_module_publish_test") { configs = [ "//utils/native/base:utils_config" ] deps = [ - "${aafwk_kits_path}/appkit:app_context", + "${ability_runtime_kits_path}/appkit:app_context", "${core_path}:ans_core", "${frameworks_module_ans_path}:ans_innerkits", "${services_path}/ans:libans", diff --git a/notification.gni b/notification.gni index 9bbc4ebab..f40f87a8d 100644 --- a/notification.gni +++ b/notification.gni @@ -11,10 +11,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -aafwk_inner_api_path = - "//foundation/ability/ability_runtime/interfaces/inner_api" -aafwk_services_path = "//foundation/ability/ability_runtime/services" -aafwk_kits_path = "//foundation/ability/ability_runtime/frameworks/kits" +ability_runtime_path = "//foundation/ability/ability_runtime" +ability_runtime_inner_api_path = + "${ability_runtime_path}/interfaces/inner_api" +ability_runtime_services_path = "${ability_runtime_path}/services" +ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits" +ability_runtime_napi_path = "${ability_runtime_path}/frameworks/js/napi/aafwk" component_name = "distributed_notification_service" component_path = "//base/notification/distributed_notification_service" services_path = "${component_path}/services" @@ -25,7 +27,6 @@ inner_api_path = "${interfaces_path}/inner_api" core_path = "${frameworks_path}/core" test_path = "${component_path}/test" tools_path = "${component_path}/tools" -ability_runtime_path = "//foundation/ability/ability_runtime" distributed_notification_supported = true subsystem_name = "notification" component_external_deps = [ diff --git a/test/common/acts/actsnotificationfuzztest/BUILD.gn b/test/common/acts/actsnotificationfuzztest/BUILD.gn index 370249f4e..08a8ede5c 100644 --- a/test/common/acts/actsnotificationfuzztest/BUILD.gn +++ b/test/common/acts/actsnotificationfuzztest/BUILD.gn @@ -30,10 +30,10 @@ ohos_systemtest("ActsNotificationFuzzTest") { configs = [ "${component_path}/test/common/acts:ansfwk_kits_test_config" ] include_dirs = [ - "${aafwk_inner_api_path}/ability_manager/include", - "${aafwk_kits_path}/ability/native/include", - "${aafwk_kits_path}/app/native/app/include/task", - "${aafwk_services_path}/abilitymgr/include", + "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_kits_path}/ability/native/include", + "${ability_runtime_kits_path}/app/native/app/include/task", + "${ability_runtime_services_path}/abilitymgr/include", "${core_path}/include", "${inner_api_path}", "${services_path}/ans/include", @@ -49,8 +49,8 @@ ohos_systemtest("ActsNotificationFuzzTest") { } deps = [ - "${aafwk_kits_path}/appkit:appkit_native", - "${aafwk_services_path}/abilitymgr:abilityms", + "${ability_runtime_kits_path}/appkit:appkit_native", + "${ability_runtime_services_path}/abilitymgr:abilityms", "${core_path}:ans_core", "${frameworks_module_ans_path}:ans_innerkits", "${services_path}/ans:ans_targets", diff --git a/test/resource/ansSTSlotGroupTest/BUILD.gn b/test/resource/ansSTSlotGroupTest/BUILD.gn index 7013b63d4..d2725268c 100644 --- a/test/resource/ansSTSlotGroupTest/BUILD.gn +++ b/test/resource/ansSTSlotGroupTest/BUILD.gn @@ -26,8 +26,8 @@ config("ansSTSlotGroupTestConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", - "${aafwk_kits_path}/appkit/native/app", - "${aafwk_services_path}/abilitymgr/include", + "${ability_runtime_kits_path}/appkit/native/app", + "${ability_runtime_services_path}/abilitymgr/include", "${inner_api_path}", ] @@ -43,7 +43,7 @@ ohos_shared_library("libraryAnsSTSlotGroupTest") { configs = [ ":ansSTSlotGroupTestConfig" ] deps = [ - "${aafwk_kits_path}/appkit:appkit_native", + "${ability_runtime_kits_path}/appkit:appkit_native", "${core_path}:ans_core", "${frameworks_module_ans_path}:ans_innerkits", "//utils/native/base:utilsbase", diff --git a/tools/dump/BUILD.gn b/tools/dump/BUILD.gn index 5bf0206b7..12d5e7603 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", - "${aafwk_kits_path}/wantagent:wantagent_innerkits_public_config", + "${ability_runtime_kits_path}/wantagent:wantagent_innerkits_public_config", ] defines = [] -- Gitee From 09879f620d72691355d61dfa310561e84f1cc0b2 Mon Sep 17 00:00:00 2001 From: zhoushicheng Date: Tue, 28 Jun 2022 09:37:05 +0800 Subject: [PATCH 3/4] aafkw->ability_runtime Signed-off-by: zhoushicheng Change-Id: I689e31b6d811ce69986a7acdfdf648607ce36de5 --- frameworks/js/napi/BUILD.gn | 2 +- frameworks/js/napi/src/reminder/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn index db41eb9c2..24e03e4ce 100644 --- a/frameworks/js/napi/BUILD.gn +++ b/frameworks/js/napi/BUILD.gn @@ -74,10 +74,10 @@ ohos_shared_library("notification") { ] deps = [ + "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_path}/frameworks/native/appkit:app_context", "${core_path}:ans_core", "${frameworks_module_ans_path}:ans_innerkits", - "${ability_runtime_napi_path}/inner/napi_common:napi_common", "//foundation/multimedia/image_standard/interfaces/innerkits:image", "//third_party/jsoncpp:jsoncpp", "//third_party/libuv:uv_static", diff --git a/frameworks/js/napi/src/reminder/BUILD.gn b/frameworks/js/napi/src/reminder/BUILD.gn index 47995b1f5..33077309d 100644 --- a/frameworks/js/napi/src/reminder/BUILD.gn +++ b/frameworks/js/napi/src/reminder/BUILD.gn @@ -55,9 +55,9 @@ ohos_shared_library("reminderagent") { ] deps = [ + "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${core_path}:ans_core", "${frameworks_module_ans_path}:ans_innerkits", - "${ability_runtime_napi_path}/inner/napi_common:napi_common", "//foundation/multimedia/image_standard/interfaces/innerkits:image", "//third_party/jsoncpp:jsoncpp", "//third_party/libuv:uv_static", -- Gitee From a6a8df8db74aaf2b3c08aadd523c25881290def9 Mon Sep 17 00:00:00 2001 From: zhoushicheng Date: Tue, 28 Jun 2022 14:55:57 +0800 Subject: [PATCH 4/4] aafwk->ability_runtime Signed-off-by: zhoushicheng Change-Id: I3c03d2496740d8bc771c45c908b58e2bf4e31df5 --- frameworks/js/napi/BUILD.gn | 2 +- notification.gni | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn index 24e03e4ce..a1d128eac 100644 --- a/frameworks/js/napi/BUILD.gn +++ b/frameworks/js/napi/BUILD.gn @@ -44,7 +44,7 @@ config("native_module_config") { ohos_shared_library("notification") { include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/ability/native", - "${ability_runtime_path}/frameworks/js/napi/aafwk/inner/napi_common", + "${ability_runtime_napi_path}/inner/napi_common", "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/", "include", "//third_party/node/src", diff --git a/notification.gni b/notification.gni index 687adcc22..5670fc5b5 100644 --- a/notification.gni +++ b/notification.gni @@ -12,8 +12,7 @@ # limitations under the License. ability_runtime_path = "//foundation/ability/ability_runtime" -ability_runtime_inner_api_path = - "${ability_runtime_path}/interfaces/inner_api" +ability_runtime_inner_api_path = "${ability_runtime_path}/interfaces/inner_api" ability_runtime_services_path = "${ability_runtime_path}/services" ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits" ability_runtime_napi_path = "${ability_runtime_path}/frameworks/js/napi/aafwk" -- Gitee