diff --git a/frameworks/ans/core/BUILD.gn b/frameworks/ans/core/BUILD.gn index 8cf575c0b090f713afbe6861b4d41eca97c445c4..75afba7bee190ca25f1b726063a0866b939dedfb 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 9b8181f07e7c2c30a0bf50e26d46a76ad177705c..7a120ef302366e6ab8e315b37456580cf5d346e8 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 dd864cd0bd69b05c60296eddad8a84b9aa33683b..a9d25195d184ea2d93038f2d51af743511f3ae0e 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 c8c3a48de71cd7facbd8e40994ef2f22b324c4c7..3d079b88406136c4e46e4104b399693f2cf57613 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 49974f7cd242a71b70e6cde774ebc990771a498d..99a52a5c14708bd4cb89e75e3d2f639b02289b45 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 c2fdd1b29a5e7044a61e6c445390046dde6f8cfb..7bf5f49ef09e945522c89469550b404d2a549f08 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 8c0f2efd5d6a4dc3ff6dbd2bcacdc5259955dec7..39561893289f55d9dc85c5df35e90c78a1caba58 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 936039c909cdf3f6d8c443da3e6ae26c37785c1c..2c7ffd04c0b827aa6143277dd999cb9432ade608 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 e33afabc488db5ebf8dad66dd43c3e32338f7221..12ec08065e3c538ddbcb370835c2161363c75910 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 0d7bc82738ce8124e73003a4c3b027382a5a0f5b..eb5f2d7fa1d8b9ec91ed9acbd64eea79a43d3226 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 2d8437643ef9fd6378e50186ff88733df0bd4fd7..df5b130f1fd3ef7a7f431b079c8a50c48c7b77ba 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 d13d88323e3cdd2e2ae1aac689003dd5105bb4a6..b1bb7d05537eac6e8cb984c47b2110fc6212a34c 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 23107e15848e53de1dbc8323cdbe2df22dc0667f..ece4efa20a9efef5d94a492a9f475be421bba21d 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 666c747cafc29d82aa40cd1d8e6b349902f49414..326b2365b79e2d97b91e82328c9060c8835350d1 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 8a5ca46cab2350d2b8f5f71a667fdb9981c9613e..d379ebca68f2c01579466d070d07bf1541996cb3 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 3e976bf56a1f295330d56fc59548900f35c51736..213e21b9c42b6745f44d525c2f80e132375096c7 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 22c67f691853cbde82f7a4662f034882ef9b87ad..337764a8b9a503fbd1e3e9c34bf50fb8205154ae 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 934c13331449282f544f764a2e1657e705f5dbd2..fedd67ba5b92678b53c71d7876ce37b3e311cd11 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 f4bcd539cf25fd6a9d822913fb6a03708da3c078..b794fb12953be540056ee4489e587ccb947bd73e 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 cdc3f2039f76bdf03ab3f911e97127a72d3115de..02432ad5b039a0a059db7e3595808b7b3f8d7b71 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 ca4688dd19f7a2d61c1577f7b8b3bda626d1a154..4747485ba98cf1388a15299f92aca0f009ca03db 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 52a13ac519655291947c7f1a0433c266e129bbaf..b1a3dde29ae188ede82b835ed38f652b1f34f40e 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",