From 664bf742d393c2639c142430c170534da3cdd475 Mon Sep 17 00:00:00 2001 From: hanhaibin Date: Thu, 10 Feb 2022 16:34:19 +0800 Subject: [PATCH] Fix atomic ability part name change Signed-off-by: hanhaibin --- frameworks/ans/core/BUILD.gn | 2 +- frameworks/ans/native/BUILD.gn | 2 +- frameworks/ans/native/test/unittest/BUILD.gn | 3 +-- frameworks/ans/test/moduletest/BUILD.gn | 14 +++++--------- frameworks/wantagent/BUILD.gn | 3 +-- .../unittest/completed_dispatcher_test/BUILD.gn | 5 ++--- .../test/unittest/pending_want_test/BUILD.gn | 5 ++--- .../test/unittest/trigger_Info_test/BUILD.gn | 5 ++--- .../test/unittest/want_agent_helper_test/BUILD.gn | 5 ++--- .../test/unittest/want_agent_info_test/BUILD.gn | 5 ++--- .../test/unittest/want_agent_test/BUILD.gn | 5 ++--- interfaces/kits/napi/ans/BUILD.gn | 4 ++-- interfaces/kits/napi/ans/src/reminder/BUILD.gn | 2 +- interfaces/kits/napi/wantagent/BUILD.gn | 3 +-- notification.gni | 4 ++-- services/ans/test/unittest/BUILD.gn | 2 +- services/distributed/BUILD.gn | 2 +- services/distributed/test/unittest/BUILD.gn | 4 ++-- services/test/moduletest/BUILD.gn | 2 +- test/common/acts/actsnotificationfuzztest/BUILD.gn | 5 ++--- test/resource/ansSTSlotGroupTest/BUILD.gn | 3 +-- test/systemtest/acts/ansDump/BUILD.gn | 3 +-- 22 files changed, 36 insertions(+), 52 deletions(-) diff --git a/frameworks/ans/core/BUILD.gn b/frameworks/ans/core/BUILD.gn index 8cf575c0b..75afba7be 100644 --- a/frameworks/ans/core/BUILD.gn +++ b/frameworks/ans/core/BUILD.gn @@ -91,7 +91,7 @@ ohos_shared_library("ans_core") { ] external_deps = [ - "ability_runtime:want", + "ability_base:want", "bundle_framework:appexecfwk_base", "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", diff --git a/frameworks/ans/native/BUILD.gn b/frameworks/ans/native/BUILD.gn index 9b8181f07..7a120ef30 100644 --- a/frameworks/ans/native/BUILD.gn +++ b/frameworks/ans/native/BUILD.gn @@ -84,7 +84,7 @@ ohos_shared_library("ans_innerkits") { ] external_deps = [ - "ability_runtime:want", + "ability_base:want", "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/frameworks/ans/native/test/unittest/BUILD.gn b/frameworks/ans/native/test/unittest/BUILD.gn index dd864cd0b..a9d25195d 100644 --- a/frameworks/ans/native/test/unittest/BUILD.gn +++ b/frameworks/ans/native/test/unittest/BUILD.gn @@ -47,8 +47,7 @@ ohos_unittest("ans_reminder_unit_test") { ] external_deps = [ - "ability_runtime:app_manager", - "ability_runtime:want", + "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", diff --git a/frameworks/ans/test/moduletest/BUILD.gn b/frameworks/ans/test/moduletest/BUILD.gn index c8c3a48de..3d079b884 100644 --- a/frameworks/ans/test/moduletest/BUILD.gn +++ b/frameworks/ans/test/moduletest/BUILD.gn @@ -82,8 +82,7 @@ ohos_moduletest("ans_fw_module_test") { } external_deps = [ - "ability_runtime:app_manager", - "ability_runtime:want", + "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", @@ -159,9 +158,8 @@ ohos_moduletest("ans_innerkits_module_publish_test") { } external_deps = [ - "ability_runtime:app_manager", - "ability_runtime:base", - "ability_runtime:want", + "ability_base:base", + "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", @@ -235,8 +233,7 @@ ohos_moduletest("ans_innerkits_module_slot_test") { } external_deps = [ - "ability_runtime:app_manager", - "ability_runtime:want", + "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", @@ -310,8 +307,7 @@ ohos_moduletest("ans_innerkits_module_setting_test") { } external_deps = [ - "ability_runtime:app_manager", - "ability_runtime:want", + "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", diff --git a/frameworks/wantagent/BUILD.gn b/frameworks/wantagent/BUILD.gn index 49974f7cd..99a52a5c1 100644 --- a/frameworks/wantagent/BUILD.gn +++ b/frameworks/wantagent/BUILD.gn @@ -63,9 +63,8 @@ ohos_shared_library("wantagent_innerkits") { ] external_deps = [ + "ability_base:want", "ability_runtime:ability_manager", - "ability_runtime:app_manager", - "ability_runtime:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", diff --git a/frameworks/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn b/frameworks/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn index c2fdd1b29..7bf5f49ef 100644 --- a/frameworks/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn +++ b/frameworks/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn @@ -39,11 +39,10 @@ ohos_unittest("completed_dispatcher_test") { ] external_deps = [ + "ability_base:base", + "ability_base:want", "ability_runtime:ability_manager", "ability_runtime:abilitykit_native", - "ability_runtime:app_manager", - "ability_runtime:base", - "ability_runtime:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", diff --git a/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn b/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn index 8c0f2efd5..395618932 100644 --- a/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn +++ b/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn @@ -46,11 +46,10 @@ ohos_unittest("pending_want_test") { ] external_deps = [ + "ability_base:base", + "ability_base:want", "ability_runtime:ability_manager", "ability_runtime:abilitykit_native", - "ability_runtime:app_manager", - "ability_runtime:base", - "ability_runtime:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", diff --git a/frameworks/wantagent/test/unittest/trigger_Info_test/BUILD.gn b/frameworks/wantagent/test/unittest/trigger_Info_test/BUILD.gn index 936039c90..2c7ffd04c 100644 --- a/frameworks/wantagent/test/unittest/trigger_Info_test/BUILD.gn +++ b/frameworks/wantagent/test/unittest/trigger_Info_test/BUILD.gn @@ -39,11 +39,10 @@ ohos_unittest("trigger_Info_test") { ] external_deps = [ + "ability_base:base", + "ability_base:want", "ability_runtime:ability_manager", "ability_runtime:abilitykit_native", - "ability_runtime:app_manager", - "ability_runtime:base", - "ability_runtime:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", diff --git a/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn b/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn index e33afabc4..12ec08065 100644 --- a/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn +++ b/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn @@ -43,11 +43,10 @@ ohos_unittest("want_agent_helper_test") { ] external_deps = [ + "ability_base:base", + "ability_base:want", "ability_runtime:ability_manager", "ability_runtime:abilitykit_native", - "ability_runtime:app_manager", - "ability_runtime:base", - "ability_runtime:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", diff --git a/frameworks/wantagent/test/unittest/want_agent_info_test/BUILD.gn b/frameworks/wantagent/test/unittest/want_agent_info_test/BUILD.gn index 0d7bc8273..eb5f2d7fa 100644 --- a/frameworks/wantagent/test/unittest/want_agent_info_test/BUILD.gn +++ b/frameworks/wantagent/test/unittest/want_agent_info_test/BUILD.gn @@ -39,11 +39,10 @@ ohos_unittest("want_agent_info_test") { ] external_deps = [ + "ability_base:base", + "ability_base:want", "ability_runtime:ability_manager", "ability_runtime:abilitykit_native", - "ability_runtime:app_manager", - "ability_runtime:base", - "ability_runtime:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", diff --git a/frameworks/wantagent/test/unittest/want_agent_test/BUILD.gn b/frameworks/wantagent/test/unittest/want_agent_test/BUILD.gn index 2d8437643..df5b130f1 100644 --- a/frameworks/wantagent/test/unittest/want_agent_test/BUILD.gn +++ b/frameworks/wantagent/test/unittest/want_agent_test/BUILD.gn @@ -39,11 +39,10 @@ ohos_unittest("want_agent_test") { ] external_deps = [ + "ability_base:base", + "ability_base:want", "ability_runtime:ability_manager", "ability_runtime:abilitykit_native", - "ability_runtime:app_manager", - "ability_runtime:base", - "ability_runtime:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", diff --git a/interfaces/kits/napi/ans/BUILD.gn b/interfaces/kits/napi/ans/BUILD.gn index d13d88323..b1bb7d055 100644 --- a/interfaces/kits/napi/ans/BUILD.gn +++ b/interfaces/kits/napi/ans/BUILD.gn @@ -75,9 +75,9 @@ ohos_shared_library("notification") { ] external_deps = [ + "ability_base:base", + "ability_base:want", "ability_runtime:abilitykit_native", - "ability_runtime:base", - "ability_runtime:want", "bundle_framework:appexecfwk_base", "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", diff --git a/interfaces/kits/napi/ans/src/reminder/BUILD.gn b/interfaces/kits/napi/ans/src/reminder/BUILD.gn index 23107e158..ece4efa20 100644 --- a/interfaces/kits/napi/ans/src/reminder/BUILD.gn +++ b/interfaces/kits/napi/ans/src/reminder/BUILD.gn @@ -64,8 +64,8 @@ ohos_shared_library("reminderagent") { ] external_deps = [ + "ability_base:want", "ability_runtime:abilitykit_native", - "ability_runtime:want", "bundle_framework:appexecfwk_base", "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", diff --git a/interfaces/kits/napi/wantagent/BUILD.gn b/interfaces/kits/napi/wantagent/BUILD.gn index 666c747ca..326b2365b 100644 --- a/interfaces/kits/napi/wantagent/BUILD.gn +++ b/interfaces/kits/napi/wantagent/BUILD.gn @@ -42,9 +42,8 @@ ohos_shared_library("wantagent") { ] external_deps = [ + "ability_base:want", "ability_runtime:abilitykit_native", - "ability_runtime:app_manager", - "ability_runtime:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "eventhandler:libeventhandler", diff --git a/notification.gni b/notification.gni index 8a5ca46ca..d379ebca6 100644 --- a/notification.gni +++ b/notification.gni @@ -30,8 +30,8 @@ tools_path = "${ans_standard_path}/tools" aafwk_path = "//foundation/aafwk/standard" ans_standard_external_deps = [ - "ability_runtime:base", - "ability_runtime:want", + "ability_base:base", + "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", diff --git a/services/ans/test/unittest/BUILD.gn b/services/ans/test/unittest/BUILD.gn index 3e976bf56..213e21b9c 100644 --- a/services/ans/test/unittest/BUILD.gn +++ b/services/ans/test/unittest/BUILD.gn @@ -75,9 +75,9 @@ ohos_unittest("ans_unit_test") { } external_deps = [ + "ability_base:want", "ability_runtime:abilitykit_native", "ability_runtime:app_manager", - "ability_runtime:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", diff --git a/services/distributed/BUILD.gn b/services/distributed/BUILD.gn index 22c67f691..337764a8b 100644 --- a/services/distributed/BUILD.gn +++ b/services/distributed/BUILD.gn @@ -45,7 +45,7 @@ ohos_shared_library("libans_distributed") { deps = [ "${core_path}:ans_core" ] external_deps = [ - "ability_runtime:want", + "ability_base:want", "distributeddatamgr:distributeddata_inner", "dmsfwk_standard:zuri", "eventhandler:libeventhandler", diff --git a/services/distributed/test/unittest/BUILD.gn b/services/distributed/test/unittest/BUILD.gn index 934c13331..fedd67ba5 100644 --- a/services/distributed/test/unittest/BUILD.gn +++ b/services/distributed/test/unittest/BUILD.gn @@ -67,8 +67,8 @@ ohos_unittest("ans_distributed_unit_test") { ] external_deps = [ - "ability_runtime:base", - "ability_runtime:want", + "ability_base:base", + "ability_base:want", "bundle_framework:appexecfwk_base", "distributeddatamgr:distributeddata_inner", "hitrace_native:libhitrace", diff --git a/services/test/moduletest/BUILD.gn b/services/test/moduletest/BUILD.gn index f4bcd539c..b794fb129 100644 --- a/services/test/moduletest/BUILD.gn +++ b/services/test/moduletest/BUILD.gn @@ -62,9 +62,9 @@ ohos_moduletest("ans_module_test") { ] external_deps = [ + "ability_base:want", "ability_runtime:abilitykit_native", "ability_runtime:app_manager", - "ability_runtime:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", diff --git a/test/common/acts/actsnotificationfuzztest/BUILD.gn b/test/common/acts/actsnotificationfuzztest/BUILD.gn index cdc3f2039..02432ad5b 100644 --- a/test/common/acts/actsnotificationfuzztest/BUILD.gn +++ b/test/common/acts/actsnotificationfuzztest/BUILD.gn @@ -74,11 +74,10 @@ ohos_systemtest("ActsNotificationFuzzTest") { "LOG_DOMAIN = 0xD002200", ] external_deps = [ + "ability_base:base", + "ability_base:want", "ability_runtime:ability_manager", "ability_runtime:abilitykit_native", - "ability_runtime:app_manager", - "ability_runtime:base", - "ability_runtime:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "dmsfwk_standard:zuri", diff --git a/test/resource/ansSTSlotGroupTest/BUILD.gn b/test/resource/ansSTSlotGroupTest/BUILD.gn index ca4688dd1..4747485ba 100644 --- a/test/resource/ansSTSlotGroupTest/BUILD.gn +++ b/test/resource/ansSTSlotGroupTest/BUILD.gn @@ -56,9 +56,8 @@ ohos_shared_library("libraryAnsSTSlotGroupTest") { ] external_deps = [ + "ability_base:want", "ability_runtime:abilitykit_native", - "ability_runtime:app_manager", - "ability_runtime:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", diff --git a/test/systemtest/acts/ansDump/BUILD.gn b/test/systemtest/acts/ansDump/BUILD.gn index 52a13ac51..b1a3dde29 100644 --- a/test/systemtest/acts/ansDump/BUILD.gn +++ b/test/systemtest/acts/ansDump/BUILD.gn @@ -40,8 +40,7 @@ ohos_systemtest("AnsDumpTest") { ] external_deps = [ - "ability_runtime:app_manager", - "ability_runtime:want", + "ability_base:want", "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", -- Gitee