diff --git a/frameworks/ans/BUILD.gn b/frameworks/ans/BUILD.gn index 2b02231442183a00a9a8c6396b5a42cbff78435b..004a72ec46588dcd5ae2ca03c03ac271e2c89ed8 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 afb357c4f3c493667a13ce57e2b4290c680509e9..a1d128eac86877484c67e31f5938b3b7881706f3 100644 --- a/frameworks/js/napi/BUILD.gn +++ b/frameworks/js/napi/BUILD.gn @@ -43,8 +43,8 @@ config("native_module_config") { ohos_shared_library("notification") { include_dirs = [ - "${aafwk_path}/interfaces/kits/native/ability/native", - "//foundation/ability/ability_runtime/frameworks/js/napi/aafwk/inner/napi_common", + "${ability_runtime_path}/interfaces/kits/native/ability/native", + "${ability_runtime_napi_path}/inner/napi_common", "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/", "include", "//third_party/node/src", @@ -74,10 +74,10 @@ ohos_shared_library("notification") { ] deps = [ - "${aafwk_path}/frameworks/native/appkit:app_context", + "${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", - "//foundation/ability/ability_runtime/frameworks/js/napi/aafwk/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 bf431849e3bd7ff998aa505a8e94ec4c3ed37ebd..33077309d3ded544c1c58498eebdf622d490c7bc 100644 --- a/frameworks/js/napi/src/reminder/BUILD.gn +++ b/frameworks/js/napi/src/reminder/BUILD.gn @@ -35,8 +35,8 @@ config("native_module_config") { ohos_shared_library("reminderagent") { include_dirs = [ - "${aafwk_path}/interfaces/kits/native/ability/native", - "//foundation/ability/ability_runtime/frameworks/js/napi/aafwk/inner/napi_common", + "${ability_runtime_path}/interfaces/kits/native/ability/native", + "${ability_runtime_path}/frameworks/js/napi/aafwk/inner/napi_common", "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/", "../../include", "//third_party/node/src", @@ -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", - "//foundation/ability/ability_runtime/frameworks/js/napi/aafwk/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 c1e6b76ba2f46d691555889e81b010fc2ed9d907..c91f5d05ac9a1af51ab52a0f6e09b468fb258281 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_path}/frameworks/native/appkit:app_context", + "${ability_runtime_path}/frameworks/native/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 95256a042ea09f13785922dfc16cb6917286dd12..5670fc5b534adde92f16efe900b9f481b4031f40 100644 --- a/notification.gni +++ b/notification.gni @@ -11,10 +11,11 @@ # 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 +26,6 @@ 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" 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 4cacddf1ff04fe014964c61a0a45076465e22c07..2026181f2353c7b92229d1c62cbb52b95a8f8144 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_path}/interfaces/kits/native/ability/native", - "${aafwk_kits_path}/app/native/app/include/task", - "${aafwk_services_path}/abilitymgr/include", + "${ability_runtime_inner_api_path}/ability_manager/include", + "${ability_runtime_path}/interfaces/kits/native/ability/native", + "${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_path}/frameworks/native/appkit:appkit_native", - "${aafwk_services_path}/abilitymgr:abilityms", + "${ability_runtime_path}/frameworks/native/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 81e3c378fc7f383824a2cd1623f2204cb36d5fa8..a1afa13ed3047ebac2ae83493a68a52e0bc195ac 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_path}/interfaces/kits/native/appkit/app", - "${aafwk_services_path}/abilitymgr/include", + "${ability_runtime_path}/interfaces/kits/native/appkit/app", + "${ability_runtime_services_path}/abilitymgr/include", "${inner_api_path}", ] @@ -43,7 +43,7 @@ ohos_shared_library("libraryAnsSTSlotGroupTest") { configs = [ ":ansSTSlotGroupTestConfig" ] deps = [ - "${aafwk_path}/frameworks/native/appkit:appkit_native", + "${ability_runtime_path}/frameworks/native/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 5bf0206b755191d89614f903621196e11cdfdf36..12d5e7603a426de07eccd51465fe50794769ca4b 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 = []