From 625c6f25d8c9c01db094e2dffa1cecbdb88390ae Mon Sep 17 00:00:00 2001 From: ql Date: Fri, 4 Mar 2022 15:37:48 +0800 Subject: [PATCH] remove dependency of dmsfwk Signed-off-by: ql Change-Id: I4142fd016aa7f310871b2cf224b72d651ca0110f --- frameworks/ans/core/BUILD.gn | 2 +- frameworks/ans/native/BUILD.gn | 2 +- frameworks/ans/native/test/unittest/BUILD.gn | 2 +- frameworks/ans/test/moduletest/BUILD.gn | 8 ++++---- interfaces/kits/napi/ans/BUILD.gn | 2 +- interfaces/kits/napi/ans/src/reminder/BUILD.gn | 2 +- notification.gni | 2 +- services/ans/test/unittest/BUILD.gn | 2 +- services/distributed/BUILD.gn | 2 +- services/distributed/test/unittest/BUILD.gn | 2 +- services/test/moduletest/BUILD.gn | 2 +- test/common/acts/BUILD.gn | 1 - test/common/acts/actsnotificationfuzztest/BUILD.gn | 1 - test/resource/ansSTSlotGroupTest/BUILD.gn | 1 - 14 files changed, 14 insertions(+), 17 deletions(-) diff --git a/frameworks/ans/core/BUILD.gn b/frameworks/ans/core/BUILD.gn index fdca50b6d..a8dcf60ae 100644 --- a/frameworks/ans/core/BUILD.gn +++ b/frameworks/ans/core/BUILD.gn @@ -92,9 +92,9 @@ ohos_shared_library("ans_core") { external_deps = [ "ability_base:want", + "ability_base:zuri", "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", - "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "multimedia_image_standard:image_native", diff --git a/frameworks/ans/native/BUILD.gn b/frameworks/ans/native/BUILD.gn index a0aa9d6cc..14163788f 100644 --- a/frameworks/ans/native/BUILD.gn +++ b/frameworks/ans/native/BUILD.gn @@ -85,8 +85,8 @@ ohos_shared_library("ans_innerkits") { external_deps = [ "ability_base:want", + "ability_base:zuri", "ability_runtime:wantagent_innerkits", - "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "multimedia_image_standard:image_native", diff --git a/frameworks/ans/native/test/unittest/BUILD.gn b/frameworks/ans/native/test/unittest/BUILD.gn index 6ff225e5b..33910ba6c 100644 --- a/frameworks/ans/native/test/unittest/BUILD.gn +++ b/frameworks/ans/native/test/unittest/BUILD.gn @@ -47,13 +47,13 @@ ohos_unittest("ans_reminder_unit_test") { external_deps = [ "ability_base:want", + "ability_base:zuri", "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "ces_standard:cesfwk_innerkits", "distributeddatamgr:distributeddata_inner", - "dmsfwk_standard:zuri", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/frameworks/ans/test/moduletest/BUILD.gn b/frameworks/ans/test/moduletest/BUILD.gn index 659542d15..a27b12468 100644 --- a/frameworks/ans/test/moduletest/BUILD.gn +++ b/frameworks/ans/test/moduletest/BUILD.gn @@ -80,13 +80,13 @@ ohos_moduletest("ans_fw_module_test") { external_deps = [ "ability_base:want", + "ability_base:zuri", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "distributeddatamgr:distributeddata_inner", - "dmsfwk_standard:zuri", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", @@ -154,13 +154,13 @@ ohos_moduletest("ans_innerkits_module_publish_test") { external_deps = [ "ability_base:base", "ability_base:want", + "ability_base:zuri", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "distributeddatamgr:distributeddata_inner", - "dmsfwk_standard:zuri", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", @@ -227,13 +227,13 @@ ohos_moduletest("ans_innerkits_module_slot_test") { external_deps = [ "ability_base:want", + "ability_base:zuri", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "distributeddatamgr:distributeddata_inner", - "dmsfwk_standard:zuri", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", @@ -300,13 +300,13 @@ ohos_moduletest("ans_innerkits_module_setting_test") { external_deps = [ "ability_base:want", + "ability_base:zuri", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "distributeddatamgr:distributeddata_inner", - "dmsfwk_standard:zuri", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/interfaces/kits/napi/ans/BUILD.gn b/interfaces/kits/napi/ans/BUILD.gn index 74ee9b535..fc5161726 100644 --- a/interfaces/kits/napi/ans/BUILD.gn +++ b/interfaces/kits/napi/ans/BUILD.gn @@ -76,10 +76,10 @@ ohos_shared_library("notification") { external_deps = [ "ability_base:base", "ability_base:want", + "ability_base:zuri", "ability_runtime:abilitykit_native", "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", - "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "napi:ace_napi", diff --git a/interfaces/kits/napi/ans/src/reminder/BUILD.gn b/interfaces/kits/napi/ans/src/reminder/BUILD.gn index 0cabca867..a3ee0b3fd 100644 --- a/interfaces/kits/napi/ans/src/reminder/BUILD.gn +++ b/interfaces/kits/napi/ans/src/reminder/BUILD.gn @@ -64,10 +64,10 @@ ohos_shared_library("reminderagent") { external_deps = [ "ability_base:want", + "ability_base:zuri", "ability_runtime:abilitykit_native", "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", - "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "napi:ace_napi", diff --git a/notification.gni b/notification.gni index d379ebca6..ed68c454f 100644 --- a/notification.gni +++ b/notification.gni @@ -32,10 +32,10 @@ aafwk_path = "//foundation/aafwk/standard" ans_standard_external_deps = [ "ability_base:base", "ability_base:want", + "ability_base:zuri", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", - "dmsfwk_standard:zuri", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/ans/test/unittest/BUILD.gn b/services/ans/test/unittest/BUILD.gn index 86cb09652..9be0e2f5f 100644 --- a/services/ans/test/unittest/BUILD.gn +++ b/services/ans/test/unittest/BUILD.gn @@ -76,6 +76,7 @@ ohos_unittest("ans_unit_test") { external_deps = [ "ability_base:want", + "ability_base:zuri", "ability_runtime:abilitykit_native", "ability_runtime:app_manager", "ability_runtime:wantagent_innerkits", @@ -84,7 +85,6 @@ ohos_unittest("ans_unit_test") { "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "distributeddatamgr:distributeddata_inner", - "dmsfwk_standard:zuri", "eventhandler:libeventhandler", "hitrace_native:libhitrace", "hiviewdfx_hilog_native:libhilog", diff --git a/services/distributed/BUILD.gn b/services/distributed/BUILD.gn index 337764a8b..86107793a 100644 --- a/services/distributed/BUILD.gn +++ b/services/distributed/BUILD.gn @@ -46,8 +46,8 @@ ohos_shared_library("libans_distributed") { external_deps = [ "ability_base:want", + "ability_base:zuri", "distributeddatamgr:distributeddata_inner", - "dmsfwk_standard:zuri", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/distributed/test/unittest/BUILD.gn b/services/distributed/test/unittest/BUILD.gn index df3f579e2..0f1d53cc6 100644 --- a/services/distributed/test/unittest/BUILD.gn +++ b/services/distributed/test/unittest/BUILD.gn @@ -69,9 +69,9 @@ ohos_unittest("ans_distributed_unit_test") { external_deps = [ "ability_base:base", "ability_base:want", + "ability_base:zuri", "bundle_framework:appexecfwk_base", "distributeddatamgr:distributeddata_inner", - "dmsfwk_standard:zuri", "hitrace_native:libhitrace", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/test/moduletest/BUILD.gn b/services/test/moduletest/BUILD.gn index a6b03d311..3e083f64d 100644 --- a/services/test/moduletest/BUILD.gn +++ b/services/test/moduletest/BUILD.gn @@ -62,6 +62,7 @@ ohos_moduletest("ans_module_test") { external_deps = [ "ability_base:want", + "ability_base:zuri", "ability_runtime:abilitykit_native", "ability_runtime:app_manager", "ability_runtime:wantagent_innerkits", @@ -70,7 +71,6 @@ ohos_moduletest("ans_module_test") { "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "distributeddatamgr:distributeddata_inner", - "dmsfwk_standard:zuri", "eventhandler:libeventhandler", "hitrace_native:libhitrace", "hiviewdfx_hilog_native:libhilog", diff --git a/test/common/acts/BUILD.gn b/test/common/acts/BUILD.gn index 190963cd3..efd738228 100644 --- a/test/common/acts/BUILD.gn +++ b/test/common/acts/BUILD.gn @@ -23,7 +23,6 @@ config("ansfwk_kits_test_config") { "//foundation/appexecfwk/standard/services/bundlemgr/include", "//utils/system/safwk/native/include", "${services_path}/include", - "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", "//foundation/distributedschedule/safwk/services/safwk/include", ] } diff --git a/test/common/acts/actsnotificationfuzztest/BUILD.gn b/test/common/acts/actsnotificationfuzztest/BUILD.gn index 02432ad5b..7fd68617a 100644 --- a/test/common/acts/actsnotificationfuzztest/BUILD.gn +++ b/test/common/acts/actsnotificationfuzztest/BUILD.gn @@ -80,7 +80,6 @@ ohos_systemtest("ActsNotificationFuzzTest") { "ability_runtime:abilitykit_native", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", - "dmsfwk_standard:zuri", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/resource/ansSTSlotGroupTest/BUILD.gn b/test/resource/ansSTSlotGroupTest/BUILD.gn index df98efbd1..677bcea62 100644 --- a/test/resource/ansSTSlotGroupTest/BUILD.gn +++ b/test/resource/ansSTSlotGroupTest/BUILD.gn @@ -30,7 +30,6 @@ config("ansSTSlotGroupTestConfig") { "//foundation/appexecfwk/standard/services/bundlemgr/include", "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", - "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", "${interfaces_path}/innerkits/ans/native/include", ] -- Gitee