diff --git a/ability_runtime.gni b/ability_runtime.gni index b062c141b410f0f3f8264c9b846a01e5f02a608b..44e557da33d03f3c30bde281cbd4d767637778f4 100644 --- a/ability_runtime.gni +++ b/ability_runtime.gni @@ -126,12 +126,6 @@ declare_args() { ability_runtime_hiperf_enable = true ability_runtime_screenlock_enable = true ability_runtime_udmf_enable = true - ability_runtime_dsoftbus_enable = false - - if (!defined(global_parts_info) || - defined(global_parts_info.communication_dsoftbus)) { - ability_runtime_dsoftbus_enable = false - } if (!defined(global_parts_info) || defined(global_parts_info.account_os_account)) { diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index 78e4332d2312c09a153f18f3f248abdc7f2fecf0..70f8536b21c96337efdbeaa3aa6c2c1a7a34c3bc 100644 --- a/services/abilitymgr/BUILD.gn +++ b/services/abilitymgr/BUILD.gn @@ -177,6 +177,7 @@ ohos_shared_library("abilityms") { "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "faultloggerd:libbacktrace_local", "ffrt:libffrt", @@ -228,11 +229,6 @@ ohos_shared_library("abilityms") { defines = [] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - defines += [ "SUPPORT_RECORDER_DSOFTBUS" ] - } - if (ability_runtime_auto_fill) { defines += [ "SUPPORT_AUTO_FILL" ] } @@ -481,6 +477,7 @@ ohos_shared_library("mission_list") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "graphic_2d:color_manager", @@ -502,11 +499,6 @@ ohos_shared_library("mission_list") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - defines += [ "SUPPORT_RECORDER_DSOFTBUS" ] - } - if (ability_runtime_child_process) { defines += [ "SUPPORT_CHILD_PROCESS" ] } diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index 079930e113987ed147cf67bb5d7e85cec60354a7..783b9893241010236eb49c291c174388ea4b837a 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -90,9 +90,7 @@ #include "sa_interceptor_manager.h" #include "scene_board_judgement.h" #include "server_constant.h" -#ifdef SUPPORT_RECORDER_DSOFTBUS #include "softbus_bus_center.h" -#endif #include "start_ability_handler/start_ability_sandbox_savefile.h" #include "start_ability_utils.h" #include "start_options_utils.h" @@ -4862,7 +4860,6 @@ bool AbilityManagerService::CheckIfOperateRemote(const Want &want) bool AbilityManagerService::GetLocalDeviceId(std::string& localDeviceId) { -#ifdef SUPPORT_RECORDER_DSOFTBUS HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); auto localNode = std::make_unique(); int32_t errCode = GetLocalNodeDeviceInfo(DM_PKG_NAME, localNode.get()); @@ -4876,7 +4873,6 @@ bool AbilityManagerService::GetLocalDeviceId(std::string& localDeviceId) AnonymizeDeviceId(localDeviceId).c_str()); return true; } -#endif TAG_LOGE(AAFwkTag::ABILITYMGR, "localDeviceId null"); return false; } diff --git a/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn b/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn index cc28aa257f2813a14e3bfe938e7bf1e1100816af..53cc9005caff4747ed370fca13f00d1dee2c20f9 100644 --- a/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn @@ -76,6 +76,7 @@ ohos_fuzztest("AbilityAppMgrAppRunningManagerFuzzTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "graphic_2d:librender_service_base", "hicollie:libhicollie", @@ -94,10 +95,6 @@ ohos_fuzztest("AbilityAppMgrAppRunningManagerFuzzTest") { "window_manager:libwmutil_static", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - defines = [] if (background_task_mgr_continuous_task_enable) { diff --git a/test/fuzztest/abilityappmgrrenderstateobservermanager_fuzzer/BUILD.gn b/test/fuzztest/abilityappmgrrenderstateobservermanager_fuzzer/BUILD.gn index ab96516cc41ee157203772904fc6bb637693b185..6ddfff18a60442f801995ce7298cbc7336196bdd 100644 --- a/test/fuzztest/abilityappmgrrenderstateobservermanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityappmgrrenderstateobservermanager_fuzzer/BUILD.gn @@ -70,6 +70,7 @@ ohos_fuzztest("AbilityAppMgrRenderStateObserverManagerFuzzTest") { "appspawn:appspawn_client", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", "hitrace:hitrace_meter", @@ -81,10 +82,6 @@ ohos_fuzztest("AbilityAppMgrRenderStateObserverManagerFuzzTest") { "window_manager:libwsutils", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilityframeworkscjenvironment_fuzzer/BUILD.gn b/test/fuzztest/abilityframeworkscjenvironment_fuzzer/BUILD.gn index 510b447d28b199e35907f818ee2e4ca781cac6c1..115e40f964b1f7573e5ad9360816590e6f5694b4 100644 --- a/test/fuzztest/abilityframeworkscjenvironment_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityframeworkscjenvironment_fuzzer/BUILD.gn @@ -82,6 +82,7 @@ ohos_fuzztest("AbilityFrameworksCjEnvironmentFuzzTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "ffrt:libffrt", @@ -91,10 +92,6 @@ ohos_fuzztest("AbilityFrameworksCjEnvironmentFuzzTest") { "napi:ace_napi", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilityframeworksnativejsworker_fuzzer/BUILD.gn b/test/fuzztest/abilityframeworksnativejsworker_fuzzer/BUILD.gn index bd49eecad7cf5aceb692fdf7103059c9061b0534..d4b3d9dabbfee689b19a94bda282d221ef33a6ff 100644 --- a/test/fuzztest/abilityframeworksnativejsworker_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityframeworksnativejsworker_fuzzer/BUILD.gn @@ -68,6 +68,7 @@ ohos_fuzztest("AbilityFrameworksNativeJsWorkerFuzzTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "ffrt:libffrt", @@ -82,10 +83,6 @@ ohos_fuzztest("AbilityFrameworksNativeJsWorkerFuzzTest") { "zlib:shared_libz", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilityframeworksnativeohosjsenvlogger_fuzzer/BUILD.gn b/test/fuzztest/abilityframeworksnativeohosjsenvlogger_fuzzer/BUILD.gn index 22001c9818cb791e18fbfde8d8edf832fe835942..a27991aec86c00f1a68b4a5870b55e7233e39f70 100644 --- a/test/fuzztest/abilityframeworksnativeohosjsenvlogger_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityframeworksnativeohosjsenvlogger_fuzzer/BUILD.gn @@ -76,6 +76,7 @@ ohos_fuzztest("AbilityFrameworksNativeOhosJsEnvLoggerFuzzTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "ffrt:libffrt", @@ -92,10 +93,6 @@ ohos_fuzztest("AbilityFrameworksNativeOhosJsEnvLoggerFuzzTest") { "zlib:shared_libz", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilitymgrabilitymanagerstub_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrabilitymanagerstub_fuzzer/BUILD.gn index 639b7240e0ffa82f9dcc3e8d9ebf5a10a45e4dfd..23ca9221d318b64662af54f04e4af651feb3cdfe 100644 --- a/test/fuzztest/abilitymgrabilitymanagerstub_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrabilitymanagerstub_fuzzer/BUILD.gn @@ -68,6 +68,7 @@ ohos_fuzztest("AbilityMgrAbilityManagerStubFuzzTest") { "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", @@ -81,10 +82,6 @@ ohos_fuzztest("AbilityMgrAbilityManagerStubFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn index 81a0c3ef376e90bc3c088cb2d881ee8da11421b0..3380a300f89f174e09a7362bed18c4b6e87b1d11 100644 --- a/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn @@ -92,6 +92,7 @@ ohos_fuzztest("AbilityMgrAppExitReasonHelperFuzzTest") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", @@ -111,10 +112,6 @@ ohos_fuzztest("AbilityMgrAppExitReasonHelperFuzzTest") { "window_manager:sms", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilitymgrcontrolinterceptor_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrcontrolinterceptor_fuzzer/BUILD.gn index efa5360d981c24d4afee237c50d5fb91c9a960dd..cbb93be38ab2ba2a95acae5954b5d10f5799101f 100644 --- a/test/fuzztest/abilitymgrcontrolinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrcontrolinterceptor_fuzzer/BUILD.gn @@ -70,6 +70,7 @@ ohos_fuzztest("AbilityMgrControlInterceptorFuzzTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", @@ -82,10 +83,6 @@ ohos_fuzztest("AbilityMgrControlInterceptorFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilitymgrdisposedruleinterceptor_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrdisposedruleinterceptor_fuzzer/BUILD.gn index def64709f6dd8677833d0172fb166878cfd3e2e8..c8e2c13af1647a74df9e9ae194cfb9ca0873d0d7 100644 --- a/test/fuzztest/abilitymgrdisposedruleinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrdisposedruleinterceptor_fuzzer/BUILD.gn @@ -63,6 +63,7 @@ ohos_fuzztest("AbilitymgrDisposedRuleInterceptorFuzzTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", "hitrace:hitrace_meter", @@ -72,10 +73,6 @@ ohos_fuzztest("AbilitymgrDisposedRuleInterceptorFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilitymgrecologicalruleinterceptor_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrecologicalruleinterceptor_fuzzer/BUILD.gn index 01f73e9e31d4e63f4e9e85ae46ed9c8f1ac5c305..ff5aac36116935de739248e1b9730e6ccc2e0b18 100644 --- a/test/fuzztest/abilitymgrecologicalruleinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrecologicalruleinterceptor_fuzzer/BUILD.gn @@ -64,6 +64,7 @@ ohos_fuzztest("AbilitymgrEcologicalRuleInterceptorFuzzTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", "hitrace:hitrace_meter", @@ -73,10 +74,6 @@ ohos_fuzztest("AbilitymgrEcologicalRuleInterceptorFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilitymgrecologicalrulemgrserviceparam_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrecologicalrulemgrserviceparam_fuzzer/BUILD.gn index d05fe5463340a9136b532ea7a3ab479060d81139..bd022830edd59db90c1dc732bd0f77a7d47717f5 100644 --- a/test/fuzztest/abilitymgrecologicalrulemgrserviceparam_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrecologicalrulemgrserviceparam_fuzzer/BUILD.gn @@ -65,6 +65,7 @@ ohos_fuzztest("AbilityMgrEcologicalRuleMgrServiceParamFuzzTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", "hitrace:hitrace_meter", @@ -74,10 +75,6 @@ ohos_fuzztest("AbilityMgrEcologicalRuleMgrServiceParamFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn index 600bccb62b16fc5047c5af05d45127c14df98f31..8367629ce24887206716412441e23b9270888b3b 100644 --- a/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn @@ -69,6 +69,7 @@ ohos_fuzztest("AbilityMgrExtensionRecordFuzzTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", @@ -81,10 +82,6 @@ ohos_fuzztest("AbilityMgrExtensionRecordFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn index d284fff2b7a25e188a8b4a070cfc95b05d9f10c9..13aa68a7d6e668513d146bb3b9978a0992edd278 100644 --- a/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn @@ -79,6 +79,7 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteManagerFuzzTest") { "bundle_framework:libappexecfwk_common", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", "hisysevent:libhisysevent", @@ -89,10 +90,6 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteManagerFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn index eee98f314e7e8efcfe79cfd2de9fd364db37b2fe..0ba4c186642a4590f061047defb2041deef4a264 100644 --- a/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn @@ -71,6 +71,7 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteResultFuzzTest") { "bundle_framework:libappexecfwk_common", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", "hisysevent:libhisysevent", @@ -81,10 +82,6 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteResultFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn index 18cf474623009f8d049bd8edb50046282a9207e8..8dc80ad4481e0fa9fc0c7dacb4275b5a2a3abb15 100644 --- a/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn @@ -71,6 +71,7 @@ ohos_fuzztest("AbilityMgrInsightIntentUtilsFuzzTest") { "bundle_framework:libappexecfwk_common", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", "hisysevent:libhisysevent", @@ -81,10 +82,6 @@ ohos_fuzztest("AbilityMgrInsightIntentUtilsFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilitymgrinterceptorexecuter_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinterceptorexecuter_fuzzer/BUILD.gn index 45f6bdd3e8ccce8370aee70023c1778da75b1538..2b2e03304aae23b64755ca3a8733fba1b10b6a7c 100644 --- a/test/fuzztest/abilitymgrinterceptorexecuter_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinterceptorexecuter_fuzzer/BUILD.gn @@ -70,6 +70,7 @@ ohos_fuzztest("AbilityMgrInterceptorExecuterFuzzTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", @@ -82,10 +83,6 @@ ohos_fuzztest("AbilityMgrInterceptorExecuterFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilitymgrjumpinterceptor_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrjumpinterceptor_fuzzer/BUILD.gn index 4397e69a9dd89555cd89cbef09f48027759dec0d..7ffd5f8fffa9765cf60cf3a6be42c9fdc8489822 100644 --- a/test/fuzztest/abilitymgrjumpinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrjumpinterceptor_fuzzer/BUILD.gn @@ -71,6 +71,7 @@ ohos_fuzztest("AbilityMgrJumpInterceptorFuzzTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", @@ -83,10 +84,6 @@ ohos_fuzztest("AbilityMgrJumpInterceptorFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn index e511ad7e5394568c3b9e6bed35c32e717ff7a03a..0da0e7315207c57a478440da090001bddf877eeb 100644 --- a/test/fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn @@ -68,6 +68,7 @@ ohos_fuzztest("AbilityMgrRdbParserUtilFuzzTest") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", "hitrace:hitrace_meter", @@ -78,10 +79,6 @@ ohos_fuzztest("AbilityMgrRdbParserUtilFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn b/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn index 32242ea9af514c8d28c2e020cafad49aa285791b..524fbe0aa84e478cb4c9f2d8b5ab1dc63425b92b 100644 --- a/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn @@ -68,6 +68,7 @@ ohos_fuzztest("AbilityMgrUiExtensionRecordFuzzTest") { "ability_runtime:ability_deps_wrapper", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", @@ -80,10 +81,6 @@ ohos_fuzztest("AbilityMgrUiExtensionRecordFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/abilitypermissionutil_fuzzer/BUILD.gn b/test/fuzztest/abilitypermissionutil_fuzzer/BUILD.gn index 3c31e316fa0a3be57f22320c2583b6033c2077af..48a124b732fbfa1db5b89d305a5fb8aa5797fa52 100644 --- a/test/fuzztest/abilitypermissionutil_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitypermissionutil_fuzzer/BUILD.gn @@ -81,6 +81,7 @@ ohos_fuzztest("AbilityPermissionUtilFuzzTest") { "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "faultloggerd:libbacktrace_local", "ffrt:libffrt", @@ -106,9 +107,6 @@ ohos_fuzztest("AbilityPermissionUtilFuzzTest") { "window_manager:session_manager_lite", "window_manager:sms", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } } ############################################################################### diff --git a/test/fuzztest/abilityresidentprocessrdb_fuzzer/BUILD.gn b/test/fuzztest/abilityresidentprocessrdb_fuzzer/BUILD.gn index ddc003ede6f7ff1bd1ab9c5dff6840c21fe0d499..2578255e1711c5df0350058b65cb168d7a94e9ad 100644 --- a/test/fuzztest/abilityresidentprocessrdb_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityresidentprocessrdb_fuzzer/BUILD.gn @@ -64,6 +64,7 @@ ohos_fuzztest("AbilityResidentProcessRdbFuzzTest") { "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "faultloggerd:libbacktrace_local", "ffrt:libffrt", @@ -90,10 +91,6 @@ ohos_fuzztest("AbilityResidentProcessRdbFuzzTest") { "window_manager:sms", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (ability_runtime_graphics) { external_deps += [ "input:libmmi-client" ] } diff --git a/test/fuzztest/crowdtestinterceptor_fuzzer/BUILD.gn b/test/fuzztest/crowdtestinterceptor_fuzzer/BUILD.gn index 6393b062d6a892f8d6446fbf0331169d7549e734..93c43e7da1427a80517260eff03e11406d271906 100644 --- a/test/fuzztest/crowdtestinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/crowdtestinterceptor_fuzzer/BUILD.gn @@ -64,6 +64,7 @@ ohos_fuzztest("CrowdTestInterceptorFuzzTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", "hitrace:hitrace_meter", @@ -73,10 +74,6 @@ ohos_fuzztest("CrowdTestInterceptorFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/extensioncontrolinterceptor_fuzzer/BUILD.gn b/test/fuzztest/extensioncontrolinterceptor_fuzzer/BUILD.gn index 4e58fc172328b87562e43ae0f2426a90c85600c1..68da591728161f0bc6a5457937e4d3a565a2f16a 100644 --- a/test/fuzztest/extensioncontrolinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/extensioncontrolinterceptor_fuzzer/BUILD.gn @@ -70,6 +70,7 @@ ohos_fuzztest("ExtensionControlInterceptorFuzzTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", @@ -82,10 +83,6 @@ ohos_fuzztest("ExtensionControlInterceptorFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/extensioncontrolinterceptorfirst_fuzzer/BUILD.gn b/test/fuzztest/extensioncontrolinterceptorfirst_fuzzer/BUILD.gn index 043f365bc540232e2b56c7d77c55fdfbe47c7ee6..dba0d41b144448f520ac1687c6419272c7002855 100644 --- a/test/fuzztest/extensioncontrolinterceptorfirst_fuzzer/BUILD.gn +++ b/test/fuzztest/extensioncontrolinterceptorfirst_fuzzer/BUILD.gn @@ -70,6 +70,7 @@ ohos_fuzztest("ExtensionControlInterceptorFirstFuzzTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", @@ -82,10 +83,6 @@ ohos_fuzztest("ExtensionControlInterceptorFirstFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/freezeutil_fuzzer/BUILD.gn b/test/fuzztest/freezeutil_fuzzer/BUILD.gn index 4f40c9a1b8e68bde01de5580bfd0c6eaf33bc9a5..8d5b02954089db83570e648a6870d97fadbf41a0 100644 --- a/test/fuzztest/freezeutil_fuzzer/BUILD.gn +++ b/test/fuzztest/freezeutil_fuzzer/BUILD.gn @@ -68,6 +68,7 @@ ohos_fuzztest("FreezeUtilFuzzTest") { "ability_runtime:ability_deps_wrapper", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", "hitrace:hitrace_meter", @@ -75,10 +76,6 @@ ohos_fuzztest("FreezeUtilFuzzTest") { "napi:ace_napi", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/openlinkoptions_fuzzer/BUILD.gn b/test/fuzztest/openlinkoptions_fuzzer/BUILD.gn index dfd58832a62321fc4f666168cd76476ff3449043..43f45f54eba1208caef8cda85ac4c1c4fc784c12 100644 --- a/test/fuzztest/openlinkoptions_fuzzer/BUILD.gn +++ b/test/fuzztest/openlinkoptions_fuzzer/BUILD.gn @@ -69,6 +69,7 @@ ohos_fuzztest("OpenLinkOptionsFuzzTest") { "ability_runtime:ability_deps_wrapper", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", "hitrace:hitrace_meter", @@ -76,10 +77,6 @@ ohos_fuzztest("OpenLinkOptionsFuzzTest") { "napi:ace_napi", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/preloaduiextstateobserver_fuzzer/BUILD.gn b/test/fuzztest/preloaduiextstateobserver_fuzzer/BUILD.gn index 88275240eaf85c1e33c2e5bbe2e5aa0042f4b9e2..72b90c87f6d0fc19b06031e4a9d969a109bd0432 100644 --- a/test/fuzztest/preloaduiextstateobserver_fuzzer/BUILD.gn +++ b/test/fuzztest/preloaduiextstateobserver_fuzzer/BUILD.gn @@ -82,6 +82,7 @@ ohos_fuzztest("PreLoadUIExtStateObserverFuzzTest") { "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "faultloggerd:libbacktrace_local", "ffrt:libffrt", @@ -108,9 +109,6 @@ ohos_fuzztest("PreLoadUIExtStateObserverFuzzTest") { "window_manager:sms", "ability_runtime:runtime", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } } ############################################################################### diff --git a/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn b/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn index 61b963179a30495393c5f8525e06ce6147ed5469..8ee773d6f1becdd82b11f51838505778c44e0912 100644 --- a/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn @@ -79,6 +79,7 @@ ohos_fuzztest("ScreenUnlockInterceptorFuzzTest") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", @@ -92,10 +93,6 @@ ohos_fuzztest("ScreenUnlockInterceptorFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (os_dlp_part_enabled) { cflags_cc += [ "-DWITH_DLP" ] } diff --git a/test/fuzztest/startotherappinterceptor_fuzzer/BUILD.gn b/test/fuzztest/startotherappinterceptor_fuzzer/BUILD.gn index 93ac8ecea60101d3a354f776adfcb3e4bb13038a..ff40a5522fd315880ea65ea009d1e740b71524e8 100644 --- a/test/fuzztest/startotherappinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/startotherappinterceptor_fuzzer/BUILD.gn @@ -75,6 +75,7 @@ ohos_fuzztest("StartOtherappinterceptorFuzzTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", @@ -87,10 +88,6 @@ ohos_fuzztest("StartOtherappinterceptorFuzzTest") { "safwk:api_cache_manager", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (os_dlp_part_enabled) { cflags_cc += [ "-DWITH_DLP" ] } diff --git a/test/fuzztest/statusbardelegatemanager_fuzzer/BUILD.gn b/test/fuzztest/statusbardelegatemanager_fuzzer/BUILD.gn index c3e64cf2dd28711dd5b081f61553c7403bcbc424..b9bcc7a019c9f2e13e589305cd2eaca078bcce33 100644 --- a/test/fuzztest/statusbardelegatemanager_fuzzer/BUILD.gn +++ b/test/fuzztest/statusbardelegatemanager_fuzzer/BUILD.gn @@ -72,6 +72,7 @@ ohos_fuzztest("StatusBarDelegateManagerFuzzTest") { "ability_runtime:ability_deps_wrapper", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", "hitrace:hitrace_meter", @@ -79,10 +80,6 @@ ohos_fuzztest("StatusBarDelegateManagerFuzzTest") { "napi:ace_napi", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/submanagershelper_fuzzer/BUILD.gn b/test/fuzztest/submanagershelper_fuzzer/BUILD.gn index 6a21ee896985c212f300b899c838ff833d8208fe..720b00bc490ac601cd2ee04fd5723b2fd6a69eb3 100644 --- a/test/fuzztest/submanagershelper_fuzzer/BUILD.gn +++ b/test/fuzztest/submanagershelper_fuzzer/BUILD.gn @@ -83,6 +83,7 @@ ohos_fuzztest("SubManagersHelperFuzzTest") { "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "faultloggerd:libbacktrace_local", "ffrt:libffrt", @@ -109,10 +110,6 @@ ohos_fuzztest("SubManagersHelperFuzzTest") { "window_manager:sms", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (ability_runtime_graphics) { external_deps += [ "input:libmmi-client" ] } diff --git a/test/fuzztest/uiabilitylifecyclemanagera_fuzzer/BUILD.gn b/test/fuzztest/uiabilitylifecyclemanagera_fuzzer/BUILD.gn index 7d11d58bf60931084686362bbc0a94abd3f09865..6721a19e7ebca8e5c0b64ff45f1299a6aedb4c18 100644 --- a/test/fuzztest/uiabilitylifecyclemanagera_fuzzer/BUILD.gn +++ b/test/fuzztest/uiabilitylifecyclemanagera_fuzzer/BUILD.gn @@ -70,6 +70,7 @@ ohos_fuzztest("UiAbilityLifeCycleManagerAFuzzTest") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", @@ -89,10 +90,6 @@ ohos_fuzztest("UiAbilityLifeCycleManagerAFuzzTest") { "window_manager:sms", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/uiabilitylifecyclemanagerb_fuzzer/BUILD.gn b/test/fuzztest/uiabilitylifecyclemanagerb_fuzzer/BUILD.gn index c1e7394b24329f51d0d20257b54f6b876a77071f..ebecb1b7992981cc3214740db7b3117c0ae78fad 100644 --- a/test/fuzztest/uiabilitylifecyclemanagerb_fuzzer/BUILD.gn +++ b/test/fuzztest/uiabilitylifecyclemanagerb_fuzzer/BUILD.gn @@ -71,6 +71,7 @@ ohos_fuzztest("UiAbilityLifeCycleManagerBFuzzTest") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", @@ -90,10 +91,6 @@ ohos_fuzztest("UiAbilityLifeCycleManagerBFuzzTest") { "window_manager:sms", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/fuzztest/uriutils_fuzzer/BUILD.gn b/test/fuzztest/uriutils_fuzzer/BUILD.gn index 60e5a7a6845281716d3389bf8bb5b95d38ecc458..992ba12030a3e01ecf779aa1d58f03104dc5870f 100644 --- a/test/fuzztest/uriutils_fuzzer/BUILD.gn +++ b/test/fuzztest/uriutils_fuzzer/BUILD.gn @@ -70,6 +70,7 @@ ohos_fuzztest("UriUtilsFuzzTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", @@ -82,10 +83,6 @@ ohos_fuzztest("UriUtilsFuzzTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (ability_runtime_upms) { defines = [ "SUPPORT_UPMS" ] deps += [ diff --git a/test/moduletest/ability_record_test/BUILD.gn b/test/moduletest/ability_record_test/BUILD.gn index 78a5d3bd0e17096a069b2819ce841a493521f749..f63d5665af21649cab54d88e47efc08a8e0a7586 100644 --- a/test/moduletest/ability_record_test/BUILD.gn +++ b/test/moduletest/ability_record_test/BUILD.gn @@ -58,6 +58,7 @@ ohos_moduletest("AbilityRecordModuleTest") { "c_utils:utils", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", @@ -75,10 +76,6 @@ ohos_moduletest("AbilityRecordModuleTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (resource_schedule_service_enable) { cflags_cc += [ "-RESOURCE_SCHEDULE_SERVICE_ENABLE" ] external_deps += [ "resource_schedule_service:ressched_client" ] diff --git a/test/moduletest/ability_timeout_module_test/BUILD.gn b/test/moduletest/ability_timeout_module_test/BUILD.gn index ae17829022b98fadff771ed0be4a6578267bbad9..24d5bf9a3ec70ee5d16648abf13f66c5e88e326c 100644 --- a/test/moduletest/ability_timeout_module_test/BUILD.gn +++ b/test/moduletest/ability_timeout_module_test/BUILD.gn @@ -85,6 +85,7 @@ ohos_moduletest("ability_timeout_module_test") { "c_utils:utils", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", @@ -107,10 +108,6 @@ ohos_moduletest("ability_timeout_module_test") { "window_manager:sms", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (resource_schedule_service_enable) { cflags_cc += [ "-RESOURCE_SCHEDULE_SERVICE_ENABLE" ] external_deps += [ "resource_schedule_service:ressched_client" ] diff --git a/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn b/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn index 52d90fec63f66d7dfc8b7718f44ec276c5e571cb..e91af62f92da8337acc4ee8a5f034f38c57926cf 100644 --- a/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn +++ b/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn @@ -62,6 +62,7 @@ ohos_moduletest("specified_ability_service_test") { "c_utils:utils", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gmock_main", @@ -79,10 +80,6 @@ ohos_moduletest("specified_ability_service_test") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (ability_runtime_graphics) { external_deps += [ "window_manager:libdm", diff --git a/test/moduletest/mission_dump_test/BUILD.gn b/test/moduletest/mission_dump_test/BUILD.gn index 9fe701d8477b81ee358f50d265bce9fb96582e05..477a5aa18a91701ee559cdde3ea6bfd1e230a011 100644 --- a/test/moduletest/mission_dump_test/BUILD.gn +++ b/test/moduletest/mission_dump_test/BUILD.gn @@ -55,6 +55,7 @@ ohos_moduletest("mission_dump_test") { "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gmock_main", @@ -67,10 +68,6 @@ ohos_moduletest("mission_dump_test") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/moduletest/panding_want_manager_test/BUILD.gn b/test/moduletest/panding_want_manager_test/BUILD.gn index e90d678ace5b9889e1e049eade2bd098f9bdd9ab..02403601799bca5a1a3f5a71ef9f728eaee3b12b 100644 --- a/test/moduletest/panding_want_manager_test/BUILD.gn +++ b/test/moduletest/panding_want_manager_test/BUILD.gn @@ -59,6 +59,7 @@ ohos_moduletest("PandingWantMgrTest") { "c_utils:utils", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", @@ -75,10 +76,6 @@ ohos_moduletest("PandingWantMgrTest") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/moduletest/running_infos_module_test/BUILD.gn b/test/moduletest/running_infos_module_test/BUILD.gn index 00a2917fdaa03535c43d42f68ea62a1248e2d22d..6536a7c81eef9cabedb0d7fa98612970df646f5e 100644 --- a/test/moduletest/running_infos_module_test/BUILD.gn +++ b/test/moduletest/running_infos_module_test/BUILD.gn @@ -89,6 +89,7 @@ ohos_moduletest("running_infos_module_test") { "c_utils:utils", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", @@ -113,10 +114,6 @@ ohos_moduletest("running_infos_module_test") { "window_manager:sms", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (resource_schedule_service_enable) { cflags_cc += [ "-RESOURCE_SCHEDULE_SERVICE_ENABLE" ] external_deps += [ "resource_schedule_service:ressched_client" ] diff --git a/test/moduletest/start_ability_implicit_module_test/BUILD.gn b/test/moduletest/start_ability_implicit_module_test/BUILD.gn index a84a58a0737a79ea8528c8385b5c7eeb3fa6397b..a73ca31bb10880c4a69445422faf9b2e626c545b 100644 --- a/test/moduletest/start_ability_implicit_module_test/BUILD.gn +++ b/test/moduletest/start_ability_implicit_module_test/BUILD.gn @@ -79,6 +79,7 @@ ohos_moduletest("start_ability_implicit_module_test") { "c_utils:utils", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", @@ -93,10 +94,6 @@ ohos_moduletest("start_ability_implicit_module_test") { "relational_store:native_rdb", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (resource_schedule_service_enable) { cflags_cc += [ "-RESOURCE_SCHEDULE_SERVICE_ENABLE" ] external_deps += [ "resource_schedule_service:ressched_client" ] diff --git a/test/unittest/ability_interceptor_second_test/BUILD.gn b/test/unittest/ability_interceptor_second_test/BUILD.gn index 1e77c1e00ab471733164c980497045da489de895..fe695b8b0345c3f4df00f18777a1bc1651336bd3 100644 --- a/test/unittest/ability_interceptor_second_test/BUILD.gn +++ b/test/unittest/ability_interceptor_second_test/BUILD.gn @@ -63,6 +63,7 @@ ohos_unittest("ability_interceptor_second_test") { "ability_runtime:ability_deps_wrapper", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gmock_main", @@ -76,10 +77,6 @@ ohos_unittest("ability_interceptor_second_test") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/unittest/ability_interceptor_test/BUILD.gn b/test/unittest/ability_interceptor_test/BUILD.gn index 64395e7d8b96d2464b3a166907455c4273c866b2..4a521a595b556611a652879ffd6954e1558c96eb 100644 --- a/test/unittest/ability_interceptor_test/BUILD.gn +++ b/test/unittest/ability_interceptor_test/BUILD.gn @@ -63,6 +63,7 @@ ohos_unittest("ability_interceptor_test") { "ability_runtime:ability_deps_wrapper", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gmock_main", @@ -76,10 +77,6 @@ ohos_unittest("ability_interceptor_test") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/unittest/ability_interceptor_third_test/BUILD.gn b/test/unittest/ability_interceptor_third_test/BUILD.gn index c8e2abff92772bb02c59d370e77a0b7f410836b2..20b50017b48f5ee5d526bdb5656d1b4baab4569f 100644 --- a/test/unittest/ability_interceptor_third_test/BUILD.gn +++ b/test/unittest/ability_interceptor_third_test/BUILD.gn @@ -65,6 +65,7 @@ ohos_unittest("ability_interceptor_third_test") { "ability_runtime:ability_deps_wrapper", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", @@ -76,10 +77,6 @@ ohos_unittest("ability_interceptor_third_test") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/unittest/ability_manager_client_branch_second_test/BUILD.gn b/test/unittest/ability_manager_client_branch_second_test/BUILD.gn index b148decdea4f162d35cef39da6c5a8b1ec194dbb..ccd62f0691ec73b9d716c77f4a8720aa606e5068 100644 --- a/test/unittest/ability_manager_client_branch_second_test/BUILD.gn +++ b/test/unittest/ability_manager_client_branch_second_test/BUILD.gn @@ -58,6 +58,7 @@ ohos_unittest("ability_manager_client_branch_second_test") { "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gmock_main", @@ -72,10 +73,6 @@ ohos_unittest("ability_manager_client_branch_second_test") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/unittest/ability_manager_client_branch_test/BUILD.gn b/test/unittest/ability_manager_client_branch_test/BUILD.gn index 2839844172a50b73cf1de73c7f21884f345e15ca..f5b2d1dba14e73e72ecc45315075538412e2854d 100644 --- a/test/unittest/ability_manager_client_branch_test/BUILD.gn +++ b/test/unittest/ability_manager_client_branch_test/BUILD.gn @@ -59,6 +59,7 @@ ohos_unittest("ability_manager_client_branch_test") { "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gmock_main", @@ -73,10 +74,6 @@ ohos_unittest("ability_manager_client_branch_test") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/unittest/ability_manager_client_branch_third_test/BUILD.gn b/test/unittest/ability_manager_client_branch_third_test/BUILD.gn index 79c012ee15c84105554486803560bf99110c2478..4d464465ef5874bdd52dee0de2279be4f08a208d 100644 --- a/test/unittest/ability_manager_client_branch_third_test/BUILD.gn +++ b/test/unittest/ability_manager_client_branch_third_test/BUILD.gn @@ -63,6 +63,7 @@ ohos_unittest("ability_manager_client_branch_third_test") { "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gmock_main", @@ -77,10 +78,6 @@ ohos_unittest("ability_manager_client_branch_third_test") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/unittest/ability_manager_service_account_test/BUILD.gn b/test/unittest/ability_manager_service_account_test/BUILD.gn index 1c30fcd0984bc7402603b8b7e728d8e6de1c57d7..6ea09b916dc9a8541c111e9c7265ad3311fb48d3 100644 --- a/test/unittest/ability_manager_service_account_test/BUILD.gn +++ b/test/unittest/ability_manager_service_account_test/BUILD.gn @@ -57,6 +57,7 @@ ohos_unittest("ability_manager_service_account_test") { "ability_runtime:ability_deps_wrapper", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", "init:libbeget_proxy", @@ -64,10 +65,6 @@ ohos_unittest("ability_manager_service_account_test") { "napi:ace_napi", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/unittest/ability_manager_service_distributed_test/BUILD.gn b/test/unittest/ability_manager_service_distributed_test/BUILD.gn index abc2fe573bcb8a56406c5f8eee3555bc71a880cb..e239e67e6f4e17b77338a8ae77d1a439a95e97dd 100755 --- a/test/unittest/ability_manager_service_distributed_test/BUILD.gn +++ b/test/unittest/ability_manager_service_distributed_test/BUILD.gn @@ -40,15 +40,13 @@ ohos_unittest("ability_manager_service_distributed_test") { "ability_runtime:ability_deps_wrapper", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn b/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn index 1e1fdf9b0f1d5f0307d9fe60a92408c64735bf36..ef14a92fd8b851b3e86b93270deb23f49ea70507 100644 --- a/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn @@ -284,6 +284,7 @@ ohos_unittest("ability_manager_service_fourteenth_test") { "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "faultloggerd:libbacktrace_local", "ffrt:libffrt", @@ -315,10 +316,6 @@ ohos_unittest("ability_manager_service_fourteenth_test") { "window_manager:window_animation_utils", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (ability_runtime_graphics) { external_deps += [ "ability_base:session_info", diff --git a/test/unittest/ability_manager_service_mock_test/BUILD.gn b/test/unittest/ability_manager_service_mock_test/BUILD.gn index 97b7c32619cb2c4c456ebae34059ee83e22e5d78..75b07c15102608cdc9fa983c98474fc791fdff12 100644 --- a/test/unittest/ability_manager_service_mock_test/BUILD.gn +++ b/test/unittest/ability_manager_service_mock_test/BUILD.gn @@ -100,6 +100,7 @@ ohos_unittest("ability_manager_service_mock_test") { "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "faultloggerd:libbacktrace_local", "ffrt:libffrt", @@ -128,9 +129,6 @@ ohos_unittest("ability_manager_service_mock_test") { "window_manager:session_manager_lite", "window_manager:sms", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } if (ability_runtime_graphics) { external_deps += [ diff --git a/test/unittest/ability_manager_service_second_test/BUILD.gn b/test/unittest/ability_manager_service_second_test/BUILD.gn index dae9e0dc2a4cadd585afa9f2efbdfde752955a50..74326d5fb8c2ab7913894c867d5ce8651f8bf7e3 100644 --- a/test/unittest/ability_manager_service_second_test/BUILD.gn +++ b/test/unittest/ability_manager_service_second_test/BUILD.gn @@ -287,6 +287,7 @@ ohos_unittest("ability_manager_service_second_test") { "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "faultloggerd:libbacktrace_local", "ffrt:libffrt", @@ -319,10 +320,6 @@ ohos_unittest("ability_manager_service_second_test") { "window_manager:window_animation_utils", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (memmgr_override_enable) { external_deps += [ "memmgr:memmgrclient" ] } diff --git a/test/unittest/ability_manager_service_third_test/BUILD.gn b/test/unittest/ability_manager_service_third_test/BUILD.gn index 435e1a4dc5758849211d3bbfe4aec87ac4d1bd3c..bb0203923c766aed7766e27535e33a46664d8281 100644 --- a/test/unittest/ability_manager_service_third_test/BUILD.gn +++ b/test/unittest/ability_manager_service_third_test/BUILD.gn @@ -115,6 +115,7 @@ ohos_unittest("ability_manager_service_third_test") { "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "faultloggerd:libbacktrace_local", "ffrt:libffrt", @@ -145,10 +146,6 @@ ohos_unittest("ability_manager_service_third_test") { "window_manager:session_manager_lite", "window_manager:sms", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - public_external_deps = [ "background_task_mgr:bgtaskmgr_innerkits" ] if (background_task_mgr_continuous_task_enable) { diff --git a/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn b/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn index e997ea518a9b39de8d105a196c737e4ee4d284e6..0ec66c91b9f8ce5859d05fb611051c251789012e 100644 --- a/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn @@ -285,6 +285,7 @@ ohos_unittest("ability_manager_service_thirteenth_test") { "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "faultloggerd:libbacktrace_local", "ffrt:libffrt", @@ -316,10 +317,6 @@ ohos_unittest("ability_manager_service_thirteenth_test") { "window_manager:window_animation_utils", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (ability_runtime_graphics) { external_deps += [ "ability_base:session_info", diff --git a/test/unittest/ability_permission_util_second_test/BUILD.gn b/test/unittest/ability_permission_util_second_test/BUILD.gn index 2fa07cdee7c2a7ac2d7ad8f06f46517b79e9b48d..9fe0fad0f6361236ca018725a9a1f0491a20d597 100644 --- a/test/unittest/ability_permission_util_second_test/BUILD.gn +++ b/test/unittest/ability_permission_util_second_test/BUILD.gn @@ -69,6 +69,7 @@ ohos_unittest("ability_permission_util_second_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", @@ -86,9 +87,6 @@ ohos_unittest("ability_permission_util_second_test") { "safwk:system_ability_fwk", "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } } group("unittest") { diff --git a/test/unittest/ability_permission_util_test/BUILD.gn b/test/unittest/ability_permission_util_test/BUILD.gn index 28dfd992298dd8d0d74f270fdd8c6ae4c729b987..c92f2ae1cd8197fb7f424d1ce26e5566475bec75 100644 --- a/test/unittest/ability_permission_util_test/BUILD.gn +++ b/test/unittest/ability_permission_util_test/BUILD.gn @@ -70,6 +70,7 @@ ohos_unittest("ability_permission_util_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "googletest:gtest_main", "hicollie:libhicollie", @@ -87,10 +88,6 @@ ohos_unittest("ability_permission_util_test") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (ability_runtime_graphics) { defines = [ "SUPPORT_SCREEN" ] external_deps += [ diff --git a/test/unittest/crowd_test_interceptor_test/BUILD.gn b/test/unittest/crowd_test_interceptor_test/BUILD.gn index 084d5dca28f73da5b3a0a0f98b6ccd0d7f3c0c6b..ed7b93fd08b596ce0d7b3a9b39b6d5d11e29ee15 100644 --- a/test/unittest/crowd_test_interceptor_test/BUILD.gn +++ b/test/unittest/crowd_test_interceptor_test/BUILD.gn @@ -49,6 +49,7 @@ ohos_unittest("crowd_test_interceptor_test") { "ability_runtime:ability_deps_wrapper", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gmock_main", @@ -63,10 +64,6 @@ ohos_unittest("crowd_test_interceptor_test") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/unittest/ecological_rule_interceptor_test/BUILD.gn b/test/unittest/ecological_rule_interceptor_test/BUILD.gn index 98b65123a504a91395cb5482b883bcfa068024a9..cd6c724a01ae82f3cb22a70ac1b458aae2836db7 100644 --- a/test/unittest/ecological_rule_interceptor_test/BUILD.gn +++ b/test/unittest/ecological_rule_interceptor_test/BUILD.gn @@ -65,6 +65,7 @@ ohos_unittest("ecological_rule_interceptor_test") { "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", @@ -76,10 +77,6 @@ ohos_unittest("ecological_rule_interceptor_test") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/unittest/extension_control_interceptor_test/BUILD.gn b/test/unittest/extension_control_interceptor_test/BUILD.gn index c2abd8c2fca190d48dba2fefa237e38cc8e4a51c..7562440b90968072720b162db3bacc0c22bbff9d 100644 --- a/test/unittest/extension_control_interceptor_test/BUILD.gn +++ b/test/unittest/extension_control_interceptor_test/BUILD.gn @@ -63,6 +63,7 @@ ohos_unittest("extension_control_interceptor_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gmock_main", @@ -75,9 +76,6 @@ ohos_unittest("extension_control_interceptor_test") { "safwk:api_cache_manager", "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } } group("unittest") { diff --git a/test/unittest/keep_alive_utils_test/BUILD.gn b/test/unittest/keep_alive_utils_test/BUILD.gn index c50d4e8aa81288e6e822a3dc0ca378ab4a6ff8da..86284d6bf517319ced7ac1f2a3ab2824c0d3aa9b 100644 --- a/test/unittest/keep_alive_utils_test/BUILD.gn +++ b/test/unittest/keep_alive_utils_test/BUILD.gn @@ -64,6 +64,7 @@ ohos_unittest("keep_alive_utils_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "googletest:gtest_main", "hicollie:libhicollie", @@ -80,9 +81,6 @@ ohos_unittest("keep_alive_utils_test") { "safwk:system_ability_fwk", "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } } group("unittest") { diff --git a/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn b/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn index 0e808111454896b56bae49758cfa65fe54e9f9ae..dd6c945fd002c403019e514eac35cf5e5e23fd86 100644 --- a/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn +++ b/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn @@ -63,6 +63,7 @@ ohos_unittest("modal_system_app_freeze_uiextension_test") { "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gmock_main", @@ -80,10 +81,6 @@ ohos_unittest("modal_system_app_freeze_uiextension_test") { "window_manager:session_manager_lite", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (ability_command_for_test) { defines += [ "ABILITY_COMMAND_FOR_TEST" ] } diff --git a/test/unittest/modal_system_dialog_util_test/BUILD.gn b/test/unittest/modal_system_dialog_util_test/BUILD.gn index e3e2937f03b938a10350ed82aa638961dd7df1ec..a35aef95282e1e8fc2829f19e6398071cb3c6029 100644 --- a/test/unittest/modal_system_dialog_util_test/BUILD.gn +++ b/test/unittest/modal_system_dialog_util_test/BUILD.gn @@ -56,6 +56,7 @@ ohos_unittest("modal_system_dialog_util_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "dsoftbus:softbus_client", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", @@ -73,9 +74,6 @@ ohos_unittest("modal_system_dialog_util_test") { "safwk:system_ability_fwk", "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } if (ability_runtime_child_process) { defines = [ "SUPPORT_CHILD_PROCESS" ] } diff --git a/test/unittest/native_child_process_test/BUILD.gn b/test/unittest/native_child_process_test/BUILD.gn index f10eec92e7c2d46e96f0f11280b029bc1e61f4d8..1bf9176c2cadb6fb08547b85ee17d4d9e8e18087 100644 --- a/test/unittest/native_child_process_test/BUILD.gn +++ b/test/unittest/native_child_process_test/BUILD.gn @@ -86,6 +86,7 @@ ohos_unittest("native_child_process_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gmock_main", @@ -103,10 +104,6 @@ ohos_unittest("native_child_process_test") { "window_manager:session_manager_lite", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/unittest/screen_unlock_interceptor_test/BUILD.gn b/test/unittest/screen_unlock_interceptor_test/BUILD.gn index 4f221f66ff0d2a9bcf0169ed64d3bb8431653338..c74a7749a282fc99d06c273682a2bc8a08e25b83 100644 --- a/test/unittest/screen_unlock_interceptor_test/BUILD.gn +++ b/test/unittest/screen_unlock_interceptor_test/BUILD.gn @@ -62,6 +62,7 @@ ohos_unittest("screen_unlock_interceptor_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gmock_main", @@ -76,10 +77,6 @@ ohos_unittest("screen_unlock_interceptor_test") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/unittest/status_bar_delegate_manager_test/BUILD.gn b/test/unittest/status_bar_delegate_manager_test/BUILD.gn index 91bcea0f55ea402f6713706ad6a41e307ac09192..5e7e4c26c5f140da3557c7e1909a1aa674143faf 100644 --- a/test/unittest/status_bar_delegate_manager_test/BUILD.gn +++ b/test/unittest/status_bar_delegate_manager_test/BUILD.gn @@ -73,6 +73,7 @@ ohos_unittest("status_bar_delegate_manager_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gmock_main", @@ -90,10 +91,6 @@ ohos_unittest("status_bar_delegate_manager_test") { "window_manager:session_manager_lite", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/unittest/ui_ability_lifecycle_manager_second_test/BUILD.gn b/test/unittest/ui_ability_lifecycle_manager_second_test/BUILD.gn index 9feeb55be7902edd714a489849fb768e41f182e1..3942668ac8172481b48a98e8c4aadb9f7b6c9fed 100644 --- a/test/unittest/ui_ability_lifecycle_manager_second_test/BUILD.gn +++ b/test/unittest/ui_ability_lifecycle_manager_second_test/BUILD.gn @@ -84,6 +84,7 @@ ohos_unittest("ui_ability_lifecycle_manager_second_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gmock_main", @@ -101,10 +102,6 @@ ohos_unittest("ui_ability_lifecycle_manager_second_test") { "window_manager:session_manager_lite", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/unittest/ui_ability_lifecycle_manager_test/BUILD.gn b/test/unittest/ui_ability_lifecycle_manager_test/BUILD.gn index 4c70ebac3842eb12b445201448e13c6fbe9bf269..9b0f8420e7892537b245471ff5debbedab4282fa 100644 --- a/test/unittest/ui_ability_lifecycle_manager_test/BUILD.gn +++ b/test/unittest/ui_ability_lifecycle_manager_test/BUILD.gn @@ -79,6 +79,7 @@ ohos_unittest("ui_ability_lifecycle_manager_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gmock_main", @@ -96,10 +97,6 @@ ohos_unittest("ui_ability_lifecycle_manager_test") { "window_manager:session_manager_lite", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] } diff --git a/test/unittest/ui_ability_lifecycle_manager_third_test/BUILD.gn b/test/unittest/ui_ability_lifecycle_manager_third_test/BUILD.gn index 8417048da5e2fbb8086d366d2d0da2663fb60257..7268d7e63def4c4d321946494b75d4c7dbe40322 100644 --- a/test/unittest/ui_ability_lifecycle_manager_third_test/BUILD.gn +++ b/test/unittest/ui_ability_lifecycle_manager_third_test/BUILD.gn @@ -85,6 +85,7 @@ ohos_unittest("ui_ability_lifecycle_manager_third_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gmock_main", @@ -101,10 +102,6 @@ ohos_unittest("ui_ability_lifecycle_manager_third_test") { "samgr:samgr_proxy", ] - if (ability_runtime_dsoftbus_enable) { - external_deps += [ "dsoftbus:softbus_client" ] - } - if (background_task_mgr_continuous_task_enable) { external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] }