From e53bde2a685afbabc60846dd61f7b225a777297f Mon Sep 17 00:00:00 2001 From: oh_ci Date: Sat, 13 Sep 2025 06:10:31 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!16457?= =?UTF-8?q?=20:=20=E8=A7=A3=E8=80=A6ability=5Fruntime=E5=AF=B9softbus?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ability_runtime.gni | 6 ------ services/abilitymgr/BUILD.gn | 12 ++---------- services/abilitymgr/src/ability_manager_service.cpp | 4 ---- .../abilityappmgrapprunningmanager_fuzzer/BUILD.gn | 5 +---- .../BUILD.gn | 5 +---- .../abilityframeworkscjenvironment_fuzzer/BUILD.gn | 5 +---- .../abilityframeworksnativejsworker_fuzzer/BUILD.gn | 5 +---- .../BUILD.gn | 5 +---- .../abilitymgrabilitymanagerstub_fuzzer/BUILD.gn | 5 +---- .../abilitymgrappexitreasonhelper_fuzzer/BUILD.gn | 5 +---- .../abilitymgrcontrolinterceptor_fuzzer/BUILD.gn | 5 +---- .../BUILD.gn | 5 +---- .../BUILD.gn | 5 +---- .../BUILD.gn | 5 +---- .../abilitymgrextensionrecord_fuzzer/BUILD.gn | 5 +---- .../BUILD.gn | 5 +---- .../BUILD.gn | 5 +---- .../abilitymgrinsightintentutils_fuzzer/BUILD.gn | 5 +---- .../abilitymgrinterceptorexecuter_fuzzer/BUILD.gn | 5 +---- .../abilitymgrjumpinterceptor_fuzzer/BUILD.gn | 5 +---- .../fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn | 5 +---- .../abilitymgruiextensionrecord_fuzzer/BUILD.gn | 5 +---- test/fuzztest/abilitypermissionutil_fuzzer/BUILD.gn | 4 +--- .../abilityresidentprocessrdb_fuzzer/BUILD.gn | 5 +---- test/fuzztest/crowdtestinterceptor_fuzzer/BUILD.gn | 5 +---- .../extensioncontrolinterceptor_fuzzer/BUILD.gn | 5 +---- .../extensioncontrolinterceptorfirst_fuzzer/BUILD.gn | 5 +---- test/fuzztest/freezeutil_fuzzer/BUILD.gn | 5 +---- test/fuzztest/openlinkoptions_fuzzer/BUILD.gn | 5 +---- .../preloaduiextstateobserver_fuzzer/BUILD.gn | 4 +--- .../fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn | 5 +---- .../startotherappinterceptor_fuzzer/BUILD.gn | 5 +---- .../statusbardelegatemanager_fuzzer/BUILD.gn | 5 +---- test/fuzztest/submanagershelper_fuzzer/BUILD.gn | 5 +---- .../uiabilitylifecyclemanagera_fuzzer/BUILD.gn | 5 +---- .../uiabilitylifecyclemanagerb_fuzzer/BUILD.gn | 5 +---- test/fuzztest/uriutils_fuzzer/BUILD.gn | 5 +---- test/moduletest/ability_record_test/BUILD.gn | 5 +---- test/moduletest/ability_timeout_module_test/BUILD.gn | 5 +---- .../ams/specified_ability_service_test/BUILD.gn | 5 +---- test/moduletest/mission_dump_test/BUILD.gn | 5 +---- test/moduletest/panding_want_manager_test/BUILD.gn | 5 +---- test/moduletest/running_infos_module_test/BUILD.gn | 5 +---- .../start_ability_implicit_module_test/BUILD.gn | 5 +---- .../ability_interceptor_second_test/BUILD.gn | 5 +---- test/unittest/ability_interceptor_test/BUILD.gn | 5 +---- .../unittest/ability_interceptor_third_test/BUILD.gn | 5 +---- .../BUILD.gn | 5 +---- .../ability_manager_client_branch_test/BUILD.gn | 5 +---- .../BUILD.gn | 5 +---- .../ability_manager_service_account_test/BUILD.gn | 5 +---- .../BUILD.gn | 4 +--- .../ability_manager_service_fourteenth_test/BUILD.gn | 5 +---- .../ability_manager_service_mock_test/BUILD.gn | 4 +--- .../ability_manager_service_second_test/BUILD.gn | 5 +---- .../ability_manager_service_third_test/BUILD.gn | 5 +---- .../ability_manager_service_thirteenth_test/BUILD.gn | 5 +---- .../ability_permission_util_second_test/BUILD.gn | 4 +--- test/unittest/ability_permission_util_test/BUILD.gn | 5 +---- test/unittest/crowd_test_interceptor_test/BUILD.gn | 5 +---- .../ecological_rule_interceptor_test/BUILD.gn | 5 +---- .../extension_control_interceptor_test/BUILD.gn | 4 +--- test/unittest/keep_alive_utils_test/BUILD.gn | 4 +--- .../BUILD.gn | 5 +---- test/unittest/modal_system_dialog_util_test/BUILD.gn | 4 +--- test/unittest/native_child_process_test/BUILD.gn | 5 +---- .../unittest/screen_unlock_interceptor_test/BUILD.gn | 5 +---- .../status_bar_delegate_manager_test/BUILD.gn | 5 +---- .../BUILD.gn | 5 +---- .../ui_ability_lifecycle_manager_test/BUILD.gn | 5 +---- .../ui_ability_lifecycle_manager_third_test/BUILD.gn | 5 +---- 71 files changed, 70 insertions(+), 284 deletions(-) diff --git a/ability_runtime.gni b/ability_runtime.gni index b062c141b41..44e557da33d 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 78e4332d231..70f8536b21c 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 079930e1139..783b9893241 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 cc28aa257f2..53cc9005caf 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 ab96516cc41..6ddfff18a60 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 510b447d28b..115e40f964b 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 bd49eecad7c..d4b3d9dabbf 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 22001c9818c..a27991aec86 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 639b7240e0f..23ca9221d31 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 81a0c3ef376..3380a300f89 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 efa5360d981..cbb93be38ab 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 def64709f6d..c8e2c13af16 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 01f73e9e31d..ff5aac36116 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 d05fe546334..bd022830edd 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 600bccb62b1..8367629ce24 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 d284fff2b7a..13aa68a7d6e 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 eee98f314e7..0ba4c186642 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 18cf4746230..8dc80ad4481 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 45f6bdd3e8c..2b2e03304aa 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 4397e69a9dd..7ffd5f8fffa 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 e511ad7e539..0da0e731520 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 32242ea9af5..524fbe0aa84 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 3c31e316fa0..48a124b732f 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 ddc003ede6f..2578255e171 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 6393b062d6a..93c43e7da14 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 4e58fc17232..68da5917281 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 043f365bc54..dba0d41b144 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 4f40c9a1b8e..8d5b0295408 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 dfd58832a62..43f45f54eba 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 88275240eaf..72b90c87f6d 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 61b963179a3..8ee773d6f1b 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 93ac8ecea60..ff40a5522fd 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 c3e64cf2dd2..b9bcc7a019c 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 6a21ee89698..720b00bc490 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 7d11d58bf60..6721a19e7eb 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 c1e7394b243..ebecb1b7992 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 60e5a7a6845..992ba12030a 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 78a5d3bd0e1..f63d5665af2 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 ae17829022b..24d5bf9a3ec 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 52d90fec63f..e91af62f92d 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 9fe701d8477..477a5aa18a9 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 e90d678ace5..02403601799 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 00a2917fdaa..6536a7c81ee 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 a84a58a0737..a73ca31bb10 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 1e77c1e00ab..fe695b8b034 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 64395e7d8b9..4a521a595b5 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 c8e2abff927..20b50017b48 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 b148decdea4..ccd62f0691e 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 2839844172a..f5b2d1dba14 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 79c012ee15c..4d464465ef5 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 1c30fcd0984..6ea09b916dc 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 abc2fe573bc..e239e67e6f4 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 1e1fdf9b0f1..ef14a92fd8b 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 97b7c32619c..75b07c15102 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 dae9e0dc2a4..74326d5fb8c 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 435e1a4dc57..bb0203923c7 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 e997ea518a9..0ec66c91b9f 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 2fa07cdee7c..9fe0fad0f63 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 28dfd992298..c92f2ae1cd8 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 084d5dca28f..ed7b93fd08b 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 98b65123a50..cd6c724a01a 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 c2abd8c2fca..7562440b909 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 c50d4e8aa81..86284d6bf51 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 0e808111454..dd6c945fd00 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 e3e2937f03b..a35aef95282 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 f10eec92e7c..1bf9176c2ca 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 4f221f66ff0..c74a7749a28 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 91bcea0f55e..5e7e4c26c5f 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 9feeb55be79..3942668ac81 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 4c70ebac384..9b0f8420e78 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 8417048da5e..7268d7e63de 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" ] } -- Gitee