From d3bcbdc1a025afda62949cc29bb4de287ed32dba Mon Sep 17 00:00:00 2001 From: wangzhen Date: Sat, 9 Aug 2025 16:34:24 +0800 Subject: [PATCH] Reorganize deps Signed-off-by: wangzhen Change-Id: I48dbce90bfe346a61d89087ec2e6c64abae210f6 --- frameworks/native/ability/native/BUILD.gn | 10 +- frameworks/native/appkit/BUILD.gn | 3 - interfaces/inner_api/ability_manager/BUILD.gn | 1 - interfaces/inner_api/app_manager/BUILD.gn | 2 - .../inner_api/extension_manager/BUILD.gn | 2 +- interfaces/inner_api/runtime/BUILD.gn | 1 - interfaces/inner_api/wantagent/BUILD.gn | 2 +- services/abilitymgr/BUILD.gn | 6 - services/appmgr/BUILD.gn | 3 - services/common/BUILD.gn | 156 ++---------------- services/uripermmgr/BUILD.gn | 1 - .../BUILD.gn | 2 +- .../abilityappmgrevent_fuzzer/BUILD.gn | 2 +- .../abilityappmgreventfirst_fuzzer/BUILD.gn | 2 +- .../abilitychildprocessrecord_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../fuzztest/abilityeventutil_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 1 - .../BUILD.gn | 2 - .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../abilitypermissionutil_fuzzer/BUILD.gn | 1 - .../cacheprocessmanagera_fuzzer/BUILD.gn | 2 - .../cacheprocessmanagerb_fuzzer/BUILD.gn | 2 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../preloaduiextstateobserver_fuzzer/BUILD.gn | 1 - .../screenunlockinterceptor_fuzzer/BUILD.gn | 2 - .../submanagershelper_fuzzer/BUILD.gn | 2 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - test/fuzztest/uriutils_fuzzer/BUILD.gn | 1 - .../ability_timeout_module_test/BUILD.gn | 2 - .../ams/ability_running_record_test/BUILD.gn | 2 - .../common/ams/app_mgr_service_test/BUILD.gn | 2 - .../common/ams/app_recent_list_test/BUILD.gn | 2 - .../common/ams/app_service_flow_test/BUILD.gn | 2 - .../common/ams/ipc_ams_mgr_test/BUILD.gn | 2 - .../common/ams/ipc_app_mgr_test/BUILD.gn | 2 - .../ams/ipc_app_scheduler_test/BUILD.gn | 2 - .../ams/service_start_process_test/BUILD.gn | 2 - .../specified_ability_service_test/BUILD.gn | 1 - .../running_infos_module_test/BUILD.gn | 2 - test/unittest/BUILD.gn | 1 - .../BUILD.gn | 2 +- .../BUILD.gn | 1 - .../unittest/ability_event_util_test/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../ability_manager_proxy_sixth_test/BUILD.gn | 2 - .../BUILD.gn | 1 - .../BUILD.gn | 4 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 4 - .../BUILD.gn | 2 +- .../BUILD.gn | 2 - .../BUILD.gn | 4 - .../BUILD.gn | 4 - .../BUILD.gn | 1 - .../ability_permission_util_test/BUILD.gn | 1 - .../ability_record_first_test/BUILD.gn | 1 - .../ability_record_second_test/BUILD.gn | 1 - test/unittest/ability_record_test/BUILD.gn | 3 +- .../ag_convert_callback_impl_test/BUILD.gn | 2 +- .../ams_ability_running_record_test/BUILD.gn | 3 - .../ams_app_death_recipient_test/BUILD.gn | 2 +- .../ams_app_running_record_test/BUILD.gn | 2 +- test/unittest/ams_app_workflow_test/BUILD.gn | 3 - .../ams_recent_app_list_test/BUILD.gn | 3 - .../BUILD.gn | 3 - .../ams_service_event_drive_test/BUILD.gn | 3 - .../BUILD.gn | 3 - .../ams_service_startup_test/BUILD.gn | 3 - .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 1 - .../BUILD.gn | 2 - .../app_exit_reason_helper_test/BUILD.gn | 1 - .../BUILD.gn | 3 - .../BUILD.gn | 3 - .../app_mgr_service_fourth_test/BUILD.gn | 2 - .../BUILD.gn | 3 - .../BUILD.gn | 2 +- .../app_mgr_service_inner_mock_test/BUILD.gn | 2 +- .../app_mgr_service_inner_ninth_test/BUILD.gn | 3 - .../BUILD.gn | 3 - .../app_mgr_service_inner_tenth_test/BUILD.gn | 3 - test/unittest/app_recovery_test/BUILD.gn | 4 +- .../app_running_manager_fourth_test/BUILD.gn | 2 +- .../app_running_manager_second_test/BUILD.gn | 2 +- .../app_running_manager_test/BUILD.gn | 2 +- .../app_running_manager_third_test/BUILD.gn | 2 +- .../app_running_processes_info_test/BUILD.gn | 3 - .../unittest/app_running_record_test/BUILD.gn | 3 +- .../app_start/js_startup_config_test/BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 3 - .../cache_process_manager_test/BUILD.gn | 2 - .../cj_ability_context_object_test/BUILD.gn | 1 - test/unittest/cj_ability_object_test/BUILD.gn | 2 +- test/unittest/cj_ui_ability_test/BUILD.gn | 2 +- .../dialog_session_manager_test/BUILD.gn | 1 - .../ets_ui_ability_instance_test/BUILD.gn | 1 - test/unittest/event_report_test/BUILD.gn | 2 +- .../file_permission_manager_test/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 6 +- .../hitrace_chain_utils_test/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../insight_intent_utils_test/BUILD.gn | 2 - test/unittest/js_ui_ability_test/BUILD.gn | 2 +- test/unittest/kiosk_manager_test/BUILD.gn | 1 - .../BUILD.gn | 1 - .../native_child_process_test/BUILD.gn | 1 - .../unittest/query_erms_manager_test/BUILD.gn | 4 +- .../query_erms_observer_manager_test/BUILD.gn | 2 +- test/unittest/rate_limiter_test/BUILD.gn | 2 +- .../BUILD.gn | 2 +- test/unittest/res_sched_util_test/BUILD.gn | 2 +- .../sa_interceptor_manager_test/BUILD.gn | 2 +- .../sa_interceptor_proxy_test/BUILD.gn | 2 +- .../sa_interceptor_stub_test/BUILD.gn | 2 +- .../screen_unlock_interceptor_test/BUILD.gn | 1 - .../status_bar_delegate_manager_test/BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - test/unittest/uri_perm_mgr_test/BUILD.gn | 2 +- .../uri_permission_impl_test/BUILD.gn | 3 +- test/unittest/uri_permission_test/BUILD.gn | 2 +- .../uri_permission_utils_test/BUILD.gn | 3 +- test/unittest/uri_utils_second_test/BUILD.gn | 1 - test/unittest/uri_utils_test/BUILD.gn | 1 - .../BUILD.gn | 2 +- 157 files changed, 77 insertions(+), 385 deletions(-) diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn index 5b726de3034..e3d0ba6a315 100644 --- a/frameworks/native/ability/native/BUILD.gn +++ b/frameworks/native/ability/native/BUILD.gn @@ -362,7 +362,6 @@ ohos_shared_library("abilitykit_native") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", ] external_deps = [ @@ -724,7 +723,7 @@ ohos_shared_library("insight_intent_executor") { "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/insight_intent/insight_intent_context:insightintentcontext", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ @@ -772,7 +771,7 @@ ohos_shared_library("insight_intent_executor_ani") { "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/insight_intent/insight_intent_context:insightintentcontext", "${ability_runtime_path}/frameworks/ets/ani/ani_common:ani_common", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ @@ -824,7 +823,7 @@ ohos_shared_library("cj_insight_intent_executor") { "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/insight_intent/insight_intent_context:insightintentcontext", "${ability_runtime_path}/frameworks/cj/ffi:cj_ability_ffi", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ @@ -923,7 +922,6 @@ ohos_shared_library("ui_ability_ani") { "${ability_runtime_path}/frameworks/ets/ani/ani_common:ani_common", "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", ] external_deps = [ @@ -1022,7 +1020,7 @@ ohos_shared_library("uiabilitykit_native") { "${ability_runtime_native_path}/appkit:appkit_delegator", "${ability_runtime_native_path}/insight_intent/insight_intent_context:insightintentcontext", "${ability_runtime_path}/utils/global/freeze:freeze_util", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/frameworks/native/appkit/BUILD.gn b/frameworks/native/appkit/BUILD.gn index 797f152348b..6bc3a281e0b 100644 --- a/frameworks/native/appkit/BUILD.gn +++ b/frameworks/native/appkit/BUILD.gn @@ -178,7 +178,6 @@ ohos_shared_library("appkit_native") { "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment", "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", ] external_deps = [ @@ -396,7 +395,6 @@ ohos_shared_library("ability_stage_ani") { "${ability_runtime_path}/frameworks/ets/ani/ani_common:ani_common", "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", ] external_deps = [ @@ -752,7 +750,6 @@ ohos_shared_library("appkit_manager_helper") { deps = [ "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/interfaces/inner_api/ability_manager/BUILD.gn b/interfaces/inner_api/ability_manager/BUILD.gn index 6a962b3e5bc..30b5d65620e 100644 --- a/interfaces/inner_api/ability_manager/BUILD.gn +++ b/interfaces/inner_api/ability_manager/BUILD.gn @@ -148,7 +148,6 @@ ohos_shared_library("ability_manager") { "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:hitrace_chain_util", ] external_deps = [ diff --git a/interfaces/inner_api/app_manager/BUILD.gn b/interfaces/inner_api/app_manager/BUILD.gn index d83479d9bdf..0d9ba5684c2 100644 --- a/interfaces/inner_api/app_manager/BUILD.gn +++ b/interfaces/inner_api/app_manager/BUILD.gn @@ -142,8 +142,6 @@ ohos_shared_library("app_manager") { "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:hitrace_chain_util", - "${ability_runtime_services_path}/common:res_sched_util", ] external_deps = [ diff --git a/interfaces/inner_api/extension_manager/BUILD.gn b/interfaces/inner_api/extension_manager/BUILD.gn index e01a8cad3b1..f48ae958b58 100755 --- a/interfaces/inner_api/extension_manager/BUILD.gn +++ b/interfaces/inner_api/extension_manager/BUILD.gn @@ -52,7 +52,7 @@ ohos_shared_library("extension_manager") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", - "${ability_runtime_services_path}/common:hitrace_chain_util", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/interfaces/inner_api/runtime/BUILD.gn b/interfaces/inner_api/runtime/BUILD.gn index 18ef4f73c9e..324a8008524 100644 --- a/interfaces/inner_api/runtime/BUILD.gn +++ b/interfaces/inner_api/runtime/BUILD.gn @@ -96,7 +96,6 @@ ohos_shared_library("runtime") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/interfaces/inner_api/wantagent/BUILD.gn b/interfaces/inner_api/wantagent/BUILD.gn index aed6a37f028..c00db08a815 100644 --- a/interfaces/inner_api/wantagent/BUILD.gn +++ b/interfaces/inner_api/wantagent/BUILD.gn @@ -72,7 +72,7 @@ ohos_shared_library("wantagent_innerkits") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_innerkits_path}/error_utils:ability_runtime_error_util", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", - "${ability_runtime_services_path}/common:hitrace_chain_util", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index 860fc328741..ecb477dd0d5 100644 --- a/services/abilitymgr/BUILD.gn +++ b/services/abilitymgr/BUILD.gn @@ -148,11 +148,7 @@ ohos_shared_library("abilityms") { "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:rate_limiter", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] @@ -450,9 +446,7 @@ ohos_shared_library("mission_list") { "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/services/appmgr/BUILD.gn b/services/appmgr/BUILD.gn index b9d6640df6b..f47a98db4b4 100644 --- a/services/appmgr/BUILD.gn +++ b/services/appmgr/BUILD.gn @@ -112,10 +112,7 @@ ohos_shared_library("libappms") { "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/services/common/BUILD.gn b/services/common/BUILD.gn index 42fc60e8300..620f2993177 100644 --- a/services/common/BUILD.gn +++ b/services/common/BUILD.gn @@ -18,7 +18,6 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni") group("ams_common_target") { deps = [ - ":event_report", ":perm_verification", ":task_handler_wrap", ] @@ -63,7 +62,7 @@ ohos_shared_library("perm_verification") { sources = [ "src/permission_verification.cpp" ] deps = [ - ":record_cost_time_util", + ":app_util", ] external_deps = [ @@ -87,34 +86,6 @@ ohos_shared_library("perm_verification") { part_name = "ability_runtime" } -ohos_shared_library("event_report") { - branch_protector_ret = "pac_ret" - - public_configs = [ ":common_config" ] - - defines = [] - if (current_cpu == "arm64") { - defines += [ "USE_EXTENSION_DATA" ] - } - - sources = [ "src/event_report.cpp" ] - - deps = [ - ":record_cost_time_util", - ] - - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - "hisysevent:libhisysevent", - "hitrace:hitrace_meter", - ] - - innerapi_tags = [ "platformsdk_indirect" ] - subsystem_name = "ability" - part_name = "ability_runtime" -} - ohos_shared_library("task_handler_wrap") { branch_protector_ret = "pac_ret" @@ -147,18 +118,27 @@ ohos_shared_library("app_util") { "src/ability_manager_radar.cpp", "src/ability_manager_xcollie.cpp", "src/app_utils.cpp", + "src/event_report.cpp", + "src/hitrace_chain_utils.cpp", "src/json_utils.cpp", + "src/rate_limiter.cpp", + "src/record_cost_time_util.cpp", + "src/res_sched_util.cpp", ] external_deps = [ + "bundle_framework:appexecfwk_base", "c_utils:utils", "config_policy:configpolicy_util", "hicollie:libhicollie", "hilog:libhilog", "hisysevent:libhisysevent", + "hitrace:hitrace_meter", + "hitrace:libhitracechain", "init:libbeget_proxy", "init:libbegetutil", "json:nlohmann_json_static", + "samgr:samgr_proxy", ] if (ability_runtime_graphics) { @@ -166,125 +146,15 @@ ohos_shared_library("app_util") { external_deps += [ "window_manager:libwsutils" ] } - if (ability_runtime_media_library_enable) { - defines += [ "ABILITY_RUNTIME_MEDIA_LIBRARY_ENABLE" ] - } - - subsystem_name = "ability" - part_name = "ability_runtime" -} - -ohos_shared_library("res_sched_util") { - sanitize = { - integer_overflow = true - ubsan = true - boundary_sanitize = true - cfi = true - cfi_cross_dso = true - debug = false - } - branch_protector_ret = "pac_ret" - - public_configs = [ ":common_config" ] - include_dirs = [ "include" ] - - sources = [ "src/res_sched_util.cpp" ] - - external_deps = [ - "bundle_framework:appexecfwk_base", - "c_utils:utils", - "hilog:libhilog", - "ipc:ipc_core", - "ipc:ipc_single", - "samgr:samgr_proxy", - ] - if (resource_schedule_service_enable) { - defines = [ "RESOURCE_SCHEDULE_SERVICE_ENABLE" ] + defines += [ "RESOURCE_SCHEDULE_SERVICE_ENABLE" ] external_deps += [ "resource_schedule_service:ressched_client" ] } - subsystem_name = "ability" - part_name = "ability_runtime" -} - -ohos_shared_library("record_cost_time_util") { - sanitize = { - integer_overflow = true - ubsan = true - boundary_sanitize = true - cfi = true - cfi_cross_dso = true - debug = false - } - branch_protector_ret = "pac_ret" - - include_dirs = [ "include" ] - - public_configs = [ ":common_config" ] - - sources = [ "src/record_cost_time_util.cpp" ] - - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - - innerapi_tags = [ "platformsdk_indirect" ] - subsystem_name = "ability" - part_name = "ability_runtime" -} - -ohos_shared_library("rate_limiter") { - sanitize = { - integer_overflow = true - ubsan = true - boundary_sanitize = true - cfi = true - cfi_cross_dso = true - debug = false - } - branch_protector_ret = "pac_ret" - - include_dirs = [ "include" ] - - public_configs = [ ":common_config" ] - - sources = [ "src/rate_limiter.cpp" ] - - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - - innerapi_tags = [ "platformsdk_indirect" ] - subsystem_name = "ability" - part_name = "ability_runtime" -} - -ohos_shared_library("hitrace_chain_util") { - sanitize = { - integer_overflow = true - ubsan = true - boundary_sanitize = true - cfi = true - cfi_cross_dso = true - debug = false + if (ability_runtime_media_library_enable) { + defines += [ "ABILITY_RUNTIME_MEDIA_LIBRARY_ENABLE" ] } - branch_protector_ret = "pac_ret" - - include_dirs = [ "include" ] - - public_configs = [ ":common_config" ] - - sources = [ "src/hitrace_chain_utils.cpp" ] - external_deps = [ - "c_utils:utils", - "hitrace:libhitracechain", - ] - - innerapi_tags = [ "platformsdk_indirect" ] subsystem_name = "ability" part_name = "ability_runtime" } \ No newline at end of file diff --git a/services/uripermmgr/BUILD.gn b/services/uripermmgr/BUILD.gn index 50b810f4fa1..045d6e62306 100644 --- a/services/uripermmgr/BUILD.gn +++ b/services/uripermmgr/BUILD.gn @@ -63,7 +63,6 @@ ohos_shared_library("libupms") { "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", ] diff --git a/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn b/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn index 53cc9005caf..288cfbad108 100644 --- a/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("AbilityAppMgrAppRunningManagerFuzzTest") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/appmgr:libappms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/fuzztest/abilityappmgrevent_fuzzer/BUILD.gn b/test/fuzztest/abilityappmgrevent_fuzzer/BUILD.gn index 91b7629f1a4..413f90d1c8f 100644 --- a/test/fuzztest/abilityappmgrevent_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityappmgrevent_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("AbilityAppMgrEventFuzzTest") { deps = [ "${ability_runtime_services_path}/appmgr:libappms", - "${ability_runtime_services_path}/common:record_cost_time_util", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/fuzztest/abilityappmgreventfirst_fuzzer/BUILD.gn b/test/fuzztest/abilityappmgreventfirst_fuzzer/BUILD.gn index 4bf94474fa3..db754d09ee3 100644 --- a/test/fuzztest/abilityappmgreventfirst_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityappmgreventfirst_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("AbilityAppMgrEventFirstFuzzTest") { deps = [ "${ability_runtime_services_path}/appmgr:libappms", - "${ability_runtime_services_path}/common:record_cost_time_util", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/fuzztest/abilitychildprocessrecord_fuzzer/BUILD.gn b/test/fuzztest/abilitychildprocessrecord_fuzzer/BUILD.gn index 8da7714bac1..2f35b710469 100644 --- a/test/fuzztest/abilitychildprocessrecord_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitychildprocessrecord_fuzzer/BUILD.gn @@ -49,7 +49,7 @@ ohos_fuzztest("AbilityChildProcessRecordFuzzTest") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_services_path}/appmgr:libappms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/fuzztest/abilitychildprocessrecordfirst_fuzzer/BUILD.gn b/test/fuzztest/abilitychildprocessrecordfirst_fuzzer/BUILD.gn index 9982985c15a..0108a6980c2 100644 --- a/test/fuzztest/abilitychildprocessrecordfirst_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitychildprocessrecordfirst_fuzzer/BUILD.gn @@ -49,7 +49,7 @@ ohos_fuzztest("AbilityChildProcessRecordFirstFuzzTest") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_services_path}/appmgr:libappms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/fuzztest/abilityeventutil_fuzzer/BUILD.gn b/test/fuzztest/abilityeventutil_fuzzer/BUILD.gn index 32a5c85235f..c4b90ea3d8c 100644 --- a/test/fuzztest/abilityeventutil_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityeventutil_fuzzer/BUILD.gn @@ -50,7 +50,7 @@ ohos_fuzztest("AbilityEventUtilFuzzTest") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/fuzztest/abilityfirstframestateobservermanager_fuzzer/BUILD.gn b/test/fuzztest/abilityfirstframestateobservermanager_fuzzer/BUILD.gn index ecafbd30b60..2f424b56c1b 100644 --- a/test/fuzztest/abilityfirstframestateobservermanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityfirstframestateobservermanager_fuzzer/BUILD.gn @@ -51,7 +51,7 @@ ohos_fuzztest("AbilityFirstFrameStateObserverManagerFuzzTest") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/fuzztest/abilitykeepalivedatamanager_fuzzer/BUILD.gn b/test/fuzztest/abilitykeepalivedatamanager_fuzzer/BUILD.gn index f9948ac813b..b79c8c338dd 100644 --- a/test/fuzztest/abilitykeepalivedatamanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitykeepalivedatamanager_fuzzer/BUILD.gn @@ -66,7 +66,6 @@ ohos_fuzztest("AbilityKeepAliveDataManagerFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn index 3380a300f89..ded0c095bd6 100644 --- a/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn @@ -74,9 +74,7 @@ ohos_fuzztest("AbilityMgrAppExitReasonHelperFuzzTest") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn index 13aa68a7d6e..4112c8bc720 100644 --- a/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn @@ -64,7 +64,7 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteManagerFuzzTest") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn index 0ba4c186642..126febd38d6 100644 --- a/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn @@ -58,7 +58,7 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteResultFuzzTest") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn index 8dc80ad4481..06085e95e27 100644 --- a/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn @@ -58,7 +58,7 @@ ohos_fuzztest("AbilityMgrInsightIntentUtilsFuzzTest") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/fuzztest/abilitypermissionutil_fuzzer/BUILD.gn b/test/fuzztest/abilitypermissionutil_fuzzer/BUILD.gn index 48a124b732f..fcba2151867 100644 --- a/test/fuzztest/abilitypermissionutil_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitypermissionutil_fuzzer/BUILD.gn @@ -58,7 +58,6 @@ ohos_fuzztest("AbilityPermissionUtilFuzzTest") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/fuzztest/cacheprocessmanagera_fuzzer/BUILD.gn b/test/fuzztest/cacheprocessmanagera_fuzzer/BUILD.gn index 4ae2a07e930..0cdfcd5c3b8 100755 --- a/test/fuzztest/cacheprocessmanagera_fuzzer/BUILD.gn +++ b/test/fuzztest/cacheprocessmanagera_fuzzer/BUILD.gn @@ -55,8 +55,6 @@ ohos_fuzztest("CacheProcessManageraFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", ] external_deps = [ diff --git a/test/fuzztest/cacheprocessmanagerb_fuzzer/BUILD.gn b/test/fuzztest/cacheprocessmanagerb_fuzzer/BUILD.gn index 14f7982daf1..e641494bc4c 100755 --- a/test/fuzztest/cacheprocessmanagerb_fuzzer/BUILD.gn +++ b/test/fuzztest/cacheprocessmanagerb_fuzzer/BUILD.gn @@ -55,8 +55,6 @@ ohos_fuzztest("CacheProcessManagerbFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagereighteenth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagereighteenth_fuzzer/BUILD.gn index b9515b6872d..e61fe921cec 100644 --- a/test/fuzztest/keepaliveprocessmanagereighteenth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagereighteenth_fuzzer/BUILD.gn @@ -65,7 +65,6 @@ ohos_fuzztest("KeepAliveProcessManagerEighteenthFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagereighth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagereighth_fuzzer/BUILD.gn index cb815bf317c..4a5f9149a7c 100644 --- a/test/fuzztest/keepaliveprocessmanagereighth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagereighth_fuzzer/BUILD.gn @@ -66,7 +66,6 @@ ohos_fuzztest("KeepAliveProcessManagerEighthFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagereleventh_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagereleventh_fuzzer/BUILD.gn index 32bf75cdd81..fd944ac29d1 100644 --- a/test/fuzztest/keepaliveprocessmanagereleventh_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagereleventh_fuzzer/BUILD.gn @@ -66,7 +66,6 @@ ohos_fuzztest("KeepAliveProcessManagerEleventhFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagerfifteenth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagerfifteenth_fuzzer/BUILD.gn index 65582f901a0..b2f75552c7e 100644 --- a/test/fuzztest/keepaliveprocessmanagerfifteenth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagerfifteenth_fuzzer/BUILD.gn @@ -66,7 +66,6 @@ ohos_fuzztest("KeepAliveProcessManagerFifteenthFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagerfifth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagerfifth_fuzzer/BUILD.gn index e2e99632a7a..4f4698b1467 100644 --- a/test/fuzztest/keepaliveprocessmanagerfifth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagerfifth_fuzzer/BUILD.gn @@ -65,7 +65,6 @@ ohos_fuzztest("KeepAliveProcessManagerFifthFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagerfirst_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagerfirst_fuzzer/BUILD.gn index 24974375c8f..c2b42dd14e2 100644 --- a/test/fuzztest/keepaliveprocessmanagerfirst_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagerfirst_fuzzer/BUILD.gn @@ -66,7 +66,6 @@ ohos_fuzztest("KeepAliveProcessManagerFirstFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagerfourteenth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagerfourteenth_fuzzer/BUILD.gn index 63f9807a935..ea5819bb1b5 100644 --- a/test/fuzztest/keepaliveprocessmanagerfourteenth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagerfourteenth_fuzzer/BUILD.gn @@ -66,7 +66,6 @@ ohos_fuzztest("KeepAliveProcessManagerFourteenthFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagerfourth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagerfourth_fuzzer/BUILD.gn index 52e0e169eaa..3f8f0f34754 100644 --- a/test/fuzztest/keepaliveprocessmanagerfourth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagerfourth_fuzzer/BUILD.gn @@ -65,7 +65,6 @@ ohos_fuzztest("KeepAliveProcessManagerFourthFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagerninteenth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagerninteenth_fuzzer/BUILD.gn index 64d20fa7d02..387da7002d0 100644 --- a/test/fuzztest/keepaliveprocessmanagerninteenth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagerninteenth_fuzzer/BUILD.gn @@ -65,7 +65,6 @@ ohos_fuzztest("KeepAliveProcessManagerNinteenthFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagerninth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagerninth_fuzzer/BUILD.gn index 39fdca3deac..5a275f3dfc1 100644 --- a/test/fuzztest/keepaliveprocessmanagerninth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagerninth_fuzzer/BUILD.gn @@ -65,7 +65,6 @@ ohos_fuzztest("KeepAliveProcessManagerNinthFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagersecond_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagersecond_fuzzer/BUILD.gn index 2b2d2d882a1..06a4a959d9f 100644 --- a/test/fuzztest/keepaliveprocessmanagersecond_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagersecond_fuzzer/BUILD.gn @@ -66,7 +66,6 @@ ohos_fuzztest("KeepAliveProcessManagerSecondFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagerseventeenth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagerseventeenth_fuzzer/BUILD.gn index 59b08590d33..181525c6ce5 100644 --- a/test/fuzztest/keepaliveprocessmanagerseventeenth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagerseventeenth_fuzzer/BUILD.gn @@ -65,7 +65,6 @@ ohos_fuzztest("KeepAliveProcessManagerSeventeenthFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagerseventh_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagerseventh_fuzzer/BUILD.gn index a90f941ce08..e734c3e63a6 100644 --- a/test/fuzztest/keepaliveprocessmanagerseventh_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagerseventh_fuzzer/BUILD.gn @@ -66,7 +66,6 @@ ohos_fuzztest("KeepAliveProcessManagerSeventhFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagersixteenth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagersixteenth_fuzzer/BUILD.gn index f4ec5bf813b..80e5a2060a5 100644 --- a/test/fuzztest/keepaliveprocessmanagersixteenth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagersixteenth_fuzzer/BUILD.gn @@ -66,7 +66,6 @@ ohos_fuzztest("KeepAliveProcessManagerSixteenthFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagersixth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagersixth_fuzzer/BUILD.gn index 48c3944b277..ebdfc7905bf 100644 --- a/test/fuzztest/keepaliveprocessmanagersixth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagersixth_fuzzer/BUILD.gn @@ -65,7 +65,6 @@ ohos_fuzztest("KeepAliveProcessManagerSixthFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagertenth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagertenth_fuzzer/BUILD.gn index 97b82a07142..83199dd197d 100644 --- a/test/fuzztest/keepaliveprocessmanagertenth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagertenth_fuzzer/BUILD.gn @@ -66,7 +66,6 @@ ohos_fuzztest("KeepAliveProcessManagerTenthFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagerthird_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagerthird_fuzzer/BUILD.gn index 7196e59e83a..38321088a32 100644 --- a/test/fuzztest/keepaliveprocessmanagerthird_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagerthird_fuzzer/BUILD.gn @@ -66,7 +66,6 @@ ohos_fuzztest("KeepAliveProcessManagerThirdFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagerthirteenth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagerthirteenth_fuzzer/BUILD.gn index 0bccb3b546e..f3a81aae382 100644 --- a/test/fuzztest/keepaliveprocessmanagerthirteenth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagerthirteenth_fuzzer/BUILD.gn @@ -66,7 +66,6 @@ ohos_fuzztest("KeepAliveProcessManagerThirteenthFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/keepaliveprocessmanagertwelfth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagertwelfth_fuzzer/BUILD.gn index 759511eb962..6dddef10090 100644 --- a/test/fuzztest/keepaliveprocessmanagertwelfth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagertwelfth_fuzzer/BUILD.gn @@ -65,7 +65,6 @@ ohos_fuzztest("KeepAliveProcessManagerTwelfthFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/preloaduiextstateobserver_fuzzer/BUILD.gn b/test/fuzztest/preloaduiextstateobserver_fuzzer/BUILD.gn index 72b90c87f6d..f9b70f14537 100644 --- a/test/fuzztest/preloaduiextstateobserver_fuzzer/BUILD.gn +++ b/test/fuzztest/preloaduiextstateobserver_fuzzer/BUILD.gn @@ -59,7 +59,6 @@ ohos_fuzztest("PreLoadUIExtStateObserverFuzzTest") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn b/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn index 1acebb0cd69..154a2a9d4c5 100644 --- a/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn @@ -60,9 +60,7 @@ ohos_fuzztest("ScreenUnlockInterceptorFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/fuzztest/submanagershelper_fuzzer/BUILD.gn b/test/fuzztest/submanagershelper_fuzzer/BUILD.gn index 720b00bc490..d5cf7248cc6 100644 --- a/test/fuzztest/submanagershelper_fuzzer/BUILD.gn +++ b/test/fuzztest/submanagershelper_fuzzer/BUILD.gn @@ -59,9 +59,7 @@ ohos_fuzztest("SubManagersHelperFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/fuzztest/uiabilitylifecyclemanagera_fuzzer/BUILD.gn b/test/fuzztest/uiabilitylifecyclemanagera_fuzzer/BUILD.gn index 6721a19e7eb..c6c12df6eaf 100644 --- a/test/fuzztest/uiabilitylifecyclemanagera_fuzzer/BUILD.gn +++ b/test/fuzztest/uiabilitylifecyclemanagera_fuzzer/BUILD.gn @@ -55,7 +55,6 @@ ohos_fuzztest("UiAbilityLifeCycleManagerAFuzzTest") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/fuzztest/uiabilitylifecyclemanagerb_fuzzer/BUILD.gn b/test/fuzztest/uiabilitylifecyclemanagerb_fuzzer/BUILD.gn index ebecb1b7992..c3c0302ee6a 100644 --- a/test/fuzztest/uiabilitylifecyclemanagerb_fuzzer/BUILD.gn +++ b/test/fuzztest/uiabilitylifecyclemanagerb_fuzzer/BUILD.gn @@ -56,7 +56,6 @@ ohos_fuzztest("UiAbilityLifeCycleManagerBFuzzTest") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/fuzztest/uriutils_fuzzer/BUILD.gn b/test/fuzztest/uriutils_fuzzer/BUILD.gn index 992ba12030a..741264a18b7 100644 --- a/test/fuzztest/uriutils_fuzzer/BUILD.gn +++ b/test/fuzztest/uriutils_fuzzer/BUILD.gn @@ -58,7 +58,6 @@ ohos_fuzztest("UriUtilsFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/moduletest/ability_timeout_module_test/BUILD.gn b/test/moduletest/ability_timeout_module_test/BUILD.gn index 24d5bf9a3ec..697de09865f 100644 --- a/test/moduletest/ability_timeout_module_test/BUILD.gn +++ b/test/moduletest/ability_timeout_module_test/BUILD.gn @@ -66,9 +66,7 @@ ohos_moduletest("ability_timeout_module_test") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/moduletest/common/ams/ability_running_record_test/BUILD.gn b/test/moduletest/common/ams/ability_running_record_test/BUILD.gn index 60e8956a967..e355294fcab 100644 --- a/test/moduletest/common/ams/ability_running_record_test/BUILD.gn +++ b/test/moduletest/common/ams/ability_running_record_test/BUILD.gn @@ -31,8 +31,6 @@ ohos_moduletest("AmsAbilityRunningRecordModuleTest") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_test_path}/moduletest/common/ams:appmgr_mst_source", ] diff --git a/test/moduletest/common/ams/app_mgr_service_test/BUILD.gn b/test/moduletest/common/ams/app_mgr_service_test/BUILD.gn index 245d98c4f01..f2c9615a278 100644 --- a/test/moduletest/common/ams/app_mgr_service_test/BUILD.gn +++ b/test/moduletest/common/ams/app_mgr_service_test/BUILD.gn @@ -41,8 +41,6 @@ ohos_moduletest("AmsAppMgrServiceModuleTest") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_test_path}/moduletest/common/ams:appmgr_mst_source", ] diff --git a/test/moduletest/common/ams/app_recent_list_test/BUILD.gn b/test/moduletest/common/ams/app_recent_list_test/BUILD.gn index d1fbca3d6f0..e885ccf5a6c 100644 --- a/test/moduletest/common/ams/app_recent_list_test/BUILD.gn +++ b/test/moduletest/common/ams/app_recent_list_test/BUILD.gn @@ -32,8 +32,6 @@ ohos_moduletest("AmsAppRecentListModuleTest") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/moduletest/common/ams:appmgr_mst_source", ] diff --git a/test/moduletest/common/ams/app_service_flow_test/BUILD.gn b/test/moduletest/common/ams/app_service_flow_test/BUILD.gn index 9a41ae9d754..7254bf589f7 100644 --- a/test/moduletest/common/ams/app_service_flow_test/BUILD.gn +++ b/test/moduletest/common/ams/app_service_flow_test/BUILD.gn @@ -35,8 +35,6 @@ ohos_moduletest("AmsAppServiceFlowModuleTest") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/moduletest/common/ams:appmgr_mst_source", ] diff --git a/test/moduletest/common/ams/ipc_ams_mgr_test/BUILD.gn b/test/moduletest/common/ams/ipc_ams_mgr_test/BUILD.gn index effd5e6d6f7..28796765143 100644 --- a/test/moduletest/common/ams/ipc_ams_mgr_test/BUILD.gn +++ b/test/moduletest/common/ams/ipc_ams_mgr_test/BUILD.gn @@ -41,8 +41,6 @@ ohos_moduletest("AmsIpcAmsmgrModuleTest") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/moduletest/common/ams:appmgr_mst_source", "${ability_runtime_test_path}/unittest:appmgr_test_source", diff --git a/test/moduletest/common/ams/ipc_app_mgr_test/BUILD.gn b/test/moduletest/common/ams/ipc_app_mgr_test/BUILD.gn index 9689d74f1b5..9f94ce7c3e2 100644 --- a/test/moduletest/common/ams/ipc_app_mgr_test/BUILD.gn +++ b/test/moduletest/common/ams/ipc_app_mgr_test/BUILD.gn @@ -33,8 +33,6 @@ ohos_moduletest("AmsIpcAppmgrModuleTest") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_test_path}/moduletest/common/ams:appmgr_mst_source", ] diff --git a/test/moduletest/common/ams/ipc_app_scheduler_test/BUILD.gn b/test/moduletest/common/ams/ipc_app_scheduler_test/BUILD.gn index 8f3185e86e1..e9432dd09c6 100644 --- a/test/moduletest/common/ams/ipc_app_scheduler_test/BUILD.gn +++ b/test/moduletest/common/ams/ipc_app_scheduler_test/BUILD.gn @@ -33,8 +33,6 @@ ohos_moduletest("AmsIpcAppSchedulerModuleTest") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_test_path}/moduletest/common/ams:appmgr_mst_source", ] diff --git a/test/moduletest/common/ams/service_start_process_test/BUILD.gn b/test/moduletest/common/ams/service_start_process_test/BUILD.gn index 92bf5be75cb..d720893a39a 100644 --- a/test/moduletest/common/ams/service_start_process_test/BUILD.gn +++ b/test/moduletest/common/ams/service_start_process_test/BUILD.gn @@ -33,8 +33,6 @@ ohos_moduletest("AmsServiceStartModuleTest") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_test_path}/moduletest/common/ams:appmgr_mst_source", ] 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 e91af62f92d..c99e89097e1 100644 --- a/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn +++ b/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn @@ -45,7 +45,6 @@ ohos_moduletest("specified_ability_service_test") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/moduletest/running_infos_module_test/BUILD.gn b/test/moduletest/running_infos_module_test/BUILD.gn index 6536a7c81ee..c382c9733ab 100644 --- a/test/moduletest/running_infos_module_test/BUILD.gn +++ b/test/moduletest/running_infos_module_test/BUILD.gn @@ -68,9 +68,7 @@ ohos_moduletest("running_infos_module_test") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 5812d791db0..ac837f764bf 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -66,7 +66,6 @@ ohos_source_set("appmgr_test_source") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:hitrace_chain_util", ] external_deps = [ diff --git a/test/unittest/ability_background_connection_test/BUILD.gn b/test/unittest/ability_background_connection_test/BUILD.gn index 0eb45cfceec..b9443976baa 100644 --- a/test/unittest/ability_background_connection_test/BUILD.gn +++ b/test/unittest/ability_background_connection_test/BUILD.gn @@ -45,7 +45,7 @@ ohos_unittest("ability_background_connection_test") { "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", diff --git a/test/unittest/ability_bundle_event_callback_test/BUILD.gn b/test/unittest/ability_bundle_event_callback_test/BUILD.gn index b5963897658..6ececf2d663 100644 --- a/test/unittest/ability_bundle_event_callback_test/BUILD.gn +++ b/test/unittest/ability_bundle_event_callback_test/BUILD.gn @@ -51,7 +51,6 @@ ohos_unittest("ability_bundle_event_callback_test") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", diff --git a/test/unittest/ability_event_util_test/BUILD.gn b/test/unittest/ability_event_util_test/BUILD.gn index cce726809bb..a3c6641f01a 100644 --- a/test/unittest/ability_event_util_test/BUILD.gn +++ b/test/unittest/ability_event_util_test/BUILD.gn @@ -44,7 +44,7 @@ ohos_unittest("ability_event_util_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/ability_manager_event_subscriber_test/BUILD.gn b/test/unittest/ability_manager_event_subscriber_test/BUILD.gn index 452dc8bd5c3..159ab868a27 100644 --- a/test/unittest/ability_manager_event_subscriber_test/BUILD.gn +++ b/test/unittest/ability_manager_event_subscriber_test/BUILD.gn @@ -45,7 +45,7 @@ ohos_unittest("ability_manager_event_subscriber_test") { "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", diff --git a/test/unittest/ability_manager_proxy_sixth_test/BUILD.gn b/test/unittest/ability_manager_proxy_sixth_test/BUILD.gn index 31a405ca388..3e2313dd1fc 100644 --- a/test/unittest/ability_manager_proxy_sixth_test/BUILD.gn +++ b/test/unittest/ability_manager_proxy_sixth_test/BUILD.gn @@ -52,9 +52,7 @@ ohos_unittest("ability_manager_proxy_sixth_test") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:hitrace_chain_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", diff --git a/test/unittest/ability_manager_service_eleven_test/BUILD.gn b/test/unittest/ability_manager_service_eleven_test/BUILD.gn index 81b99d53d7c..e332547bf0e 100644 --- a/test/unittest/ability_manager_service_eleven_test/BUILD.gn +++ b/test/unittest/ability_manager_service_eleven_test/BUILD.gn @@ -73,7 +73,6 @@ ohos_unittest("ability_manager_service_eleven_test") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", diff --git a/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn b/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn index c8712a741a3..e898bfdfde5 100644 --- a/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn @@ -256,11 +256,7 @@ ohos_unittest("ability_manager_service_fourteenth_test") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:mission_list", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:rate_limiter", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/ability_manager_service_fourth_test/BUILD.gn b/test/unittest/ability_manager_service_fourth_test/BUILD.gn index a4d09d987de..c900ad28e1e 100644 --- a/test/unittest/ability_manager_service_fourth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_fourth_test/BUILD.gn @@ -82,7 +82,6 @@ ohos_unittest("ability_manager_service_fourth_test") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/ability_manager_service_mock_test/BUILD.gn b/test/unittest/ability_manager_service_mock_test/BUILD.gn index 2d4c140cd04..8f705391d9e 100644 --- a/test/unittest/ability_manager_service_mock_test/BUILD.gn +++ b/test/unittest/ability_manager_service_mock_test/BUILD.gn @@ -78,7 +78,6 @@ ohos_unittest("ability_manager_service_mock_test") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/ability_manager_service_second_test/BUILD.gn b/test/unittest/ability_manager_service_second_test/BUILD.gn index 0528a8c6826..bbb219becb1 100644 --- a/test/unittest/ability_manager_service_second_test/BUILD.gn +++ b/test/unittest/ability_manager_service_second_test/BUILD.gn @@ -257,11 +257,7 @@ ohos_unittest("ability_manager_service_second_test") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:mission_list", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:rate_limiter", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/ability_manager_service_seventh_test/BUILD.gn b/test/unittest/ability_manager_service_seventh_test/BUILD.gn index 7b1e3be494a..9e927b970a5 100644 --- a/test/unittest/ability_manager_service_seventh_test/BUILD.gn +++ b/test/unittest/ability_manager_service_seventh_test/BUILD.gn @@ -42,7 +42,7 @@ ohos_unittest("ability_manager_service_seventh_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:process_options", - "${ability_runtime_services_path}/common:record_cost_time_util", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/unittest/ability_manager_service_sixth_test/BUILD.gn b/test/unittest/ability_manager_service_sixth_test/BUILD.gn index 6f326eeea24..d422ab68be8 100644 --- a/test/unittest/ability_manager_service_sixth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_sixth_test/BUILD.gn @@ -72,9 +72,7 @@ ohos_unittest("ability_manager_service_sixth_test") { "${ability_runtime_services_path}/abilitymgr:mission_list", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/ability_manager_service_third_test/BUILD.gn b/test/unittest/ability_manager_service_third_test/BUILD.gn index 3184a5ee67f..e17ae25e199 100644 --- a/test/unittest/ability_manager_service_third_test/BUILD.gn +++ b/test/unittest/ability_manager_service_third_test/BUILD.gn @@ -85,11 +85,7 @@ ohos_unittest("ability_manager_service_third_test") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:rate_limiter", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", ] diff --git a/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn b/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn index d4cbe09ed85..21f58dbd60c 100644 --- a/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn @@ -257,11 +257,7 @@ ohos_unittest("ability_manager_service_thirteenth_test") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:mission_list", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:rate_limiter", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/ability_manager_service_twelfth_test/BUILD.gn b/test/unittest/ability_manager_service_twelfth_test/BUILD.gn index 106783e490d..23fa739bfb1 100644 --- a/test/unittest/ability_manager_service_twelfth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_twelfth_test/BUILD.gn @@ -86,7 +86,6 @@ ohos_unittest("ability_manager_service_twelfth_test") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", ] diff --git a/test/unittest/ability_permission_util_test/BUILD.gn b/test/unittest/ability_permission_util_test/BUILD.gn index c92f2ae1cd8..b7e18da6881 100644 --- a/test/unittest/ability_permission_util_test/BUILD.gn +++ b/test/unittest/ability_permission_util_test/BUILD.gn @@ -55,7 +55,6 @@ ohos_unittest("ability_permission_util_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/unittest/ability_record_first_test/BUILD.gn b/test/unittest/ability_record_first_test/BUILD.gn index 39acaf93772..2c22b6f5faa 100644 --- a/test/unittest/ability_record_first_test/BUILD.gn +++ b/test/unittest/ability_record_first_test/BUILD.gn @@ -42,7 +42,6 @@ ohos_unittest("ability_record_first_test") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", ] external_deps = [ diff --git a/test/unittest/ability_record_second_test/BUILD.gn b/test/unittest/ability_record_second_test/BUILD.gn index f5f3810d2bd..dd58f932259 100644 --- a/test/unittest/ability_record_second_test/BUILD.gn +++ b/test/unittest/ability_record_second_test/BUILD.gn @@ -55,7 +55,6 @@ ohos_unittest("ability_record_second_test") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", ] diff --git a/test/unittest/ability_record_test/BUILD.gn b/test/unittest/ability_record_test/BUILD.gn index 71eca609330..39316c10150 100644 --- a/test/unittest/ability_record_test/BUILD.gn +++ b/test/unittest/ability_record_test/BUILD.gn @@ -55,9 +55,8 @@ ohos_unittest("ability_record_test") { "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", diff --git a/test/unittest/ag_convert_callback_impl_test/BUILD.gn b/test/unittest/ag_convert_callback_impl_test/BUILD.gn index 24665f4056a..43ceb9fa163 100644 --- a/test/unittest/ag_convert_callback_impl_test/BUILD.gn +++ b/test/unittest/ag_convert_callback_impl_test/BUILD.gn @@ -46,7 +46,7 @@ ohos_unittest("ag_convert_callback_impl_test") { "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", diff --git a/test/unittest/ams_ability_running_record_test/BUILD.gn b/test/unittest/ams_ability_running_record_test/BUILD.gn index 7064b15201a..6394d648285 100644 --- a/test/unittest/ams_ability_running_record_test/BUILD.gn +++ b/test/unittest/ams_ability_running_record_test/BUILD.gn @@ -63,10 +63,7 @@ ohos_unittest("AmsAbilityRunningRecordTest") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/unittest:appmgr_test_source", ] diff --git a/test/unittest/ams_app_death_recipient_test/BUILD.gn b/test/unittest/ams_app_death_recipient_test/BUILD.gn index 61c2a129d0f..596c1cc6c87 100644 --- a/test/unittest/ams_app_death_recipient_test/BUILD.gn +++ b/test/unittest/ams_app_death_recipient_test/BUILD.gn @@ -40,7 +40,7 @@ ohos_unittest("AppDeathRecipientTest") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/appmgr:libappms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/unittest:appmgr_test_source", diff --git a/test/unittest/ams_app_running_record_test/BUILD.gn b/test/unittest/ams_app_running_record_test/BUILD.gn index b38dcdd82d1..bb2fd036ae7 100644 --- a/test/unittest/ams_app_running_record_test/BUILD.gn +++ b/test/unittest/ams_app_running_record_test/BUILD.gn @@ -51,7 +51,7 @@ ohos_unittest("AmsAppRunningRecordTest") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/appmgr:libappms", - "${ability_runtime_services_path}/common:res_sched_util", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/ams_app_workflow_test/BUILD.gn b/test/unittest/ams_app_workflow_test/BUILD.gn index 58a0b0303e2..add508279f4 100644 --- a/test/unittest/ams_app_workflow_test/BUILD.gn +++ b/test/unittest/ams_app_workflow_test/BUILD.gn @@ -52,10 +52,7 @@ ohos_unittest("AmsWorkFlowTest") { deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/unittest:appmgr_test_source", "${distributedschedule_path}/safwk/interfaces/innerkits/safwk:system_ability_fwk", diff --git a/test/unittest/ams_recent_app_list_test/BUILD.gn b/test/unittest/ams_recent_app_list_test/BUILD.gn index d60d2ca0441..b38527c65ce 100644 --- a/test/unittest/ams_recent_app_list_test/BUILD.gn +++ b/test/unittest/ams_recent_app_list_test/BUILD.gn @@ -64,10 +64,7 @@ ohos_unittest("AmsRecentAppListTest") { "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/unittest:appmgr_test_source", ] diff --git a/test/unittest/ams_service_app_spawn_client_test/BUILD.gn b/test/unittest/ams_service_app_spawn_client_test/BUILD.gn index 0077518b672..328d4b35f76 100644 --- a/test/unittest/ams_service_app_spawn_client_test/BUILD.gn +++ b/test/unittest/ams_service_app_spawn_client_test/BUILD.gn @@ -67,10 +67,7 @@ ohos_unittest("AmsServiceAppSpawnClientTest") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/unittest:appmgr_test_source", "${distributedschedule_path}/safwk/interfaces/innerkits/safwk:system_ability_fwk", diff --git a/test/unittest/ams_service_event_drive_test/BUILD.gn b/test/unittest/ams_service_event_drive_test/BUILD.gn index b8c94365e88..a31022ebc11 100644 --- a/test/unittest/ams_service_event_drive_test/BUILD.gn +++ b/test/unittest/ams_service_event_drive_test/BUILD.gn @@ -67,10 +67,7 @@ ohos_unittest("AmsServiceEventDriveTest") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/unittest:appmgr_test_source", "${distributedschedule_path}/safwk/interfaces/innerkits/safwk:system_ability_fwk", diff --git a/test/unittest/ams_service_load_ability_process_test/BUILD.gn b/test/unittest/ams_service_load_ability_process_test/BUILD.gn index 8ceefa8055c..acf535fff36 100644 --- a/test/unittest/ams_service_load_ability_process_test/BUILD.gn +++ b/test/unittest/ams_service_load_ability_process_test/BUILD.gn @@ -72,10 +72,7 @@ ohos_unittest("AmsServiceLoadAbilityProcessTest") { "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/unittest:appmgr_test_source", ] diff --git a/test/unittest/ams_service_startup_test/BUILD.gn b/test/unittest/ams_service_startup_test/BUILD.gn index 1ba09810280..aa36d882ad8 100644 --- a/test/unittest/ams_service_startup_test/BUILD.gn +++ b/test/unittest/ams_service_startup_test/BUILD.gn @@ -64,10 +64,7 @@ ohos_unittest("AmsServiceStartupTest") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/unittest:appmgr_test_source", ] diff --git a/test/unittest/app_exit_reason_data_manager_new_test/BUILD.gn b/test/unittest/app_exit_reason_data_manager_new_test/BUILD.gn index b6c3f8eef32..98e532b5e1e 100644 --- a/test/unittest/app_exit_reason_data_manager_new_test/BUILD.gn +++ b/test/unittest/app_exit_reason_data_manager_new_test/BUILD.gn @@ -42,7 +42,7 @@ ohos_unittest("app_exit_reason_data_manager_new_test") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/unittest/app_exit_reason_data_manager_second_test/BUILD.gn b/test/unittest/app_exit_reason_data_manager_second_test/BUILD.gn index 613f79b7725..a81d5083478 100644 --- a/test/unittest/app_exit_reason_data_manager_second_test/BUILD.gn +++ b/test/unittest/app_exit_reason_data_manager_second_test/BUILD.gn @@ -42,7 +42,7 @@ ohos_unittest("app_exit_reason_data_manager_second_test") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/unittest/app_exit_reason_data_manager_test/BUILD.gn b/test/unittest/app_exit_reason_data_manager_test/BUILD.gn index b07301aff62..a96496f2c60 100755 --- a/test/unittest/app_exit_reason_data_manager_test/BUILD.gn +++ b/test/unittest/app_exit_reason_data_manager_test/BUILD.gn @@ -42,7 +42,7 @@ ohos_unittest("app_exit_reason_data_manager_test") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_services_path}/abilitymgr:abilityms", - "${ability_runtime_services_path}/common:record_cost_time_util", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/unittest/app_exit_reason_helper_fourth_test/BUILD.gn b/test/unittest/app_exit_reason_helper_fourth_test/BUILD.gn index 845eeea20c9..d9fc1413dd0 100644 --- a/test/unittest/app_exit_reason_helper_fourth_test/BUILD.gn +++ b/test/unittest/app_exit_reason_helper_fourth_test/BUILD.gn @@ -64,7 +64,6 @@ ohos_unittest("app_exit_reason_helper_fourth_test") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/app_exit_reason_helper_second_test/BUILD.gn b/test/unittest/app_exit_reason_helper_second_test/BUILD.gn index 0fd6a0dcf28..acda1fcc542 100644 --- a/test/unittest/app_exit_reason_helper_second_test/BUILD.gn +++ b/test/unittest/app_exit_reason_helper_second_test/BUILD.gn @@ -55,9 +55,7 @@ ohos_unittest("app_exit_reason_helper_second_test") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/app_exit_reason_helper_test/BUILD.gn b/test/unittest/app_exit_reason_helper_test/BUILD.gn index 12890423f5e..2095d98081e 100644 --- a/test/unittest/app_exit_reason_helper_test/BUILD.gn +++ b/test/unittest/app_exit_reason_helper_test/BUILD.gn @@ -48,7 +48,6 @@ ohos_unittest("app_exit_reason_helper_test") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/app_exit_reason_helper_third_test/BUILD.gn b/test/unittest/app_exit_reason_helper_third_test/BUILD.gn index d7fb3a42d71..0722f73fe0a 100644 --- a/test/unittest/app_exit_reason_helper_third_test/BUILD.gn +++ b/test/unittest/app_exit_reason_helper_third_test/BUILD.gn @@ -62,10 +62,7 @@ ohos_unittest("app_exit_reason_helper_third_test") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/app_mgr_service_event_handler_test/BUILD.gn b/test/unittest/app_mgr_service_event_handler_test/BUILD.gn index f10ab814e2e..efb2348f1ad 100644 --- a/test/unittest/app_mgr_service_event_handler_test/BUILD.gn +++ b/test/unittest/app_mgr_service_event_handler_test/BUILD.gn @@ -68,10 +68,7 @@ ohos_unittest("AMSEventHandlerTest") { "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/unittest:appmgr_test_source", ] diff --git a/test/unittest/app_mgr_service_fourth_test/BUILD.gn b/test/unittest/app_mgr_service_fourth_test/BUILD.gn index 3acb0107ed8..d1496174162 100644 --- a/test/unittest/app_mgr_service_fourth_test/BUILD.gn +++ b/test/unittest/app_mgr_service_fourth_test/BUILD.gn @@ -58,10 +58,8 @@ ohos_unittest("app_mgr_service_fourth_test") { "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_path}/utils/server/startup:startup_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_test_path}/moduletest/common/ams:appmgr_mst_source", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/app_mgr_service_inner_eighth_test/BUILD.gn b/test/unittest/app_mgr_service_inner_eighth_test/BUILD.gn index 136073f96b8..c5c221c0d5f 100644 --- a/test/unittest/app_mgr_service_inner_eighth_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_eighth_test/BUILD.gn @@ -100,10 +100,7 @@ ohos_unittest("app_mgr_service_inner_eighth_test") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/app_mgr_service_inner_fourth_test/BUILD.gn b/test/unittest/app_mgr_service_inner_fourth_test/BUILD.gn index 7f2e88f1826..53b7850edcd 100644 --- a/test/unittest/app_mgr_service_inner_fourth_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_fourth_test/BUILD.gn @@ -55,7 +55,7 @@ ohos_unittest("AppMgrServiceInnerFourthTest") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/appmgr:libappms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/app_mgr_service_inner_mock_test/BUILD.gn b/test/unittest/app_mgr_service_inner_mock_test/BUILD.gn index f7de5c202a7..9cce713d9b6 100644 --- a/test/unittest/app_mgr_service_inner_mock_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_mock_test/BUILD.gn @@ -44,7 +44,7 @@ ohos_unittest("app_mgr_service_inner_mock_test") { ] deps = [ - "${ability_runtime_services_path}/common:record_cost_time_util", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/unittest/app_mgr_service_inner_ninth_test/BUILD.gn b/test/unittest/app_mgr_service_inner_ninth_test/BUILD.gn index 0ad3739a084..e213c737c51 100644 --- a/test/unittest/app_mgr_service_inner_ninth_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_ninth_test/BUILD.gn @@ -99,10 +99,7 @@ ohos_unittest("app_mgr_service_inner_ninth_test") { "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/app_mgr_service_inner_seventh_test/BUILD.gn b/test/unittest/app_mgr_service_inner_seventh_test/BUILD.gn index b5a2dfff8d4..fdc70948f07 100644 --- a/test/unittest/app_mgr_service_inner_seventh_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_seventh_test/BUILD.gn @@ -99,10 +99,7 @@ ohos_unittest("app_mgr_service_inner_seventh_test") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/app_mgr_service_inner_tenth_test/BUILD.gn b/test/unittest/app_mgr_service_inner_tenth_test/BUILD.gn index e8bb5daeb20..7efebcf22e0 100644 --- a/test/unittest/app_mgr_service_inner_tenth_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_tenth_test/BUILD.gn @@ -104,10 +104,7 @@ ohos_unittest("app_mgr_service_inner_tenth_test") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/app_recovery_test/BUILD.gn b/test/unittest/app_recovery_test/BUILD.gn index 091c787c0df..b34d460c87c 100644 --- a/test/unittest/app_recovery_test/BUILD.gn +++ b/test/unittest/app_recovery_test/BUILD.gn @@ -44,7 +44,7 @@ ohos_unittest("AppRecoveryUnitTest") { "${ability_runtime_native_path}/appkit:app_context_utils", "${ability_runtime_native_path}/appkit:appkit_delegator", "${ability_runtime_path}/utils/global/freeze:freeze_util", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ @@ -107,7 +107,7 @@ ohos_unittest("AbilityRecoveryUnitTest") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:app_context_utils", "${ability_runtime_native_path}/appkit:appkit_delegator", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/unittest/app_running_manager_fourth_test/BUILD.gn b/test/unittest/app_running_manager_fourth_test/BUILD.gn index 8272bd4e799..3fb6ea9180b 100644 --- a/test/unittest/app_running_manager_fourth_test/BUILD.gn +++ b/test/unittest/app_running_manager_fourth_test/BUILD.gn @@ -35,7 +35,7 @@ ohos_unittest("app_running_manager_fourth_test") { "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/appmgr:libappms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/app_running_manager_second_test/BUILD.gn b/test/unittest/app_running_manager_second_test/BUILD.gn index 327b3b48b7e..c24a584bdbf 100644 --- a/test/unittest/app_running_manager_second_test/BUILD.gn +++ b/test/unittest/app_running_manager_second_test/BUILD.gn @@ -43,7 +43,7 @@ ohos_unittest("app_running_manager_second_test") { "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/appmgr:libappms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/app_running_manager_test/BUILD.gn b/test/unittest/app_running_manager_test/BUILD.gn index 385e3559555..92c045211bf 100644 --- a/test/unittest/app_running_manager_test/BUILD.gn +++ b/test/unittest/app_running_manager_test/BUILD.gn @@ -30,7 +30,7 @@ ohos_unittest("app_running_manager_test") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_services_path}/appmgr:libappms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/app_running_manager_third_test/BUILD.gn b/test/unittest/app_running_manager_third_test/BUILD.gn index cb44f0c6333..239bdce2b7a 100644 --- a/test/unittest/app_running_manager_third_test/BUILD.gn +++ b/test/unittest/app_running_manager_third_test/BUILD.gn @@ -48,7 +48,7 @@ ohos_unittest("app_running_manager_third_test") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/appmgr:libappms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/app_running_processes_info_test/BUILD.gn b/test/unittest/app_running_processes_info_test/BUILD.gn index 74ff4798688..1bb5b4cc77b 100644 --- a/test/unittest/app_running_processes_info_test/BUILD.gn +++ b/test/unittest/app_running_processes_info_test/BUILD.gn @@ -66,10 +66,7 @@ ohos_unittest("AppRunningProcessesInfoTest") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/unittest:appmgr_test_source", ] diff --git a/test/unittest/app_running_record_test/BUILD.gn b/test/unittest/app_running_record_test/BUILD.gn index 5a2b87d7530..86cd43e87fb 100644 --- a/test/unittest/app_running_record_test/BUILD.gn +++ b/test/unittest/app_running_record_test/BUILD.gn @@ -36,9 +36,8 @@ ohos_unittest("app_running_record_test") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_services_path}/appmgr:libappms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/app_start/js_startup_config_test/BUILD.gn b/test/unittest/app_start/js_startup_config_test/BUILD.gn index abdaff26714..528ae4897a0 100644 --- a/test/unittest/app_start/js_startup_config_test/BUILD.gn +++ b/test/unittest/app_start/js_startup_config_test/BUILD.gn @@ -59,7 +59,6 @@ ohos_unittest("js_startup_config_test") { "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment", "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", ] external_deps = [ diff --git a/test/unittest/assert_fault_callback_death_mgr_test/BUILD.gn b/test/unittest/assert_fault_callback_death_mgr_test/BUILD.gn index 176c8e28899..f6b2f9e4674 100644 --- a/test/unittest/assert_fault_callback_death_mgr_test/BUILD.gn +++ b/test/unittest/assert_fault_callback_death_mgr_test/BUILD.gn @@ -58,7 +58,6 @@ ohos_unittest("assert_fault_callback_death_mgr_test") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", diff --git a/test/unittest/cache_process_manager_second_test/BUILD.gn b/test/unittest/cache_process_manager_second_test/BUILD.gn index 7e9b86f4e81..26e3a5dfcf3 100644 --- a/test/unittest/cache_process_manager_second_test/BUILD.gn +++ b/test/unittest/cache_process_manager_second_test/BUILD.gn @@ -113,10 +113,7 @@ ohos_unittest("cache_process_manager_second_test") { "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/cache_process_manager_test/BUILD.gn b/test/unittest/cache_process_manager_test/BUILD.gn index a2dc318f649..4810717530f 100644 --- a/test/unittest/cache_process_manager_test/BUILD.gn +++ b/test/unittest/cache_process_manager_test/BUILD.gn @@ -45,8 +45,6 @@ ohos_unittest("cache_process_manager_test") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:record_cost_time_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/cj_ability_context_object_test/BUILD.gn b/test/unittest/cj_ability_context_object_test/BUILD.gn index 3191a2b5934..0599c2c0ac9 100644 --- a/test/unittest/cj_ability_context_object_test/BUILD.gn +++ b/test/unittest/cj_ability_context_object_test/BUILD.gn @@ -61,7 +61,6 @@ ohos_unittest("cj_ability_context_object_test") { "${ability_runtime_path}/frameworks/native/ability/native:extension_blocklist_config", "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", ] external_deps = [ diff --git a/test/unittest/cj_ability_object_test/BUILD.gn b/test/unittest/cj_ability_object_test/BUILD.gn index 3996cf2801a..358889240d3 100644 --- a/test/unittest/cj_ability_object_test/BUILD.gn +++ b/test/unittest/cj_ability_object_test/BUILD.gn @@ -44,7 +44,7 @@ ohos_unittest("cj_ability_object_test") { "${ability_runtime_native_path}/insight_intent/insight_intent_context:insightintentcontext", "${ability_runtime_path}/frameworks/cj/ffi:cj_ability_ffi", "${ability_runtime_path}/utils/global/freeze:freeze_util", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/unittest/cj_ui_ability_test/BUILD.gn b/test/unittest/cj_ui_ability_test/BUILD.gn index 577e74add1d..6ac252fdbbf 100644 --- a/test/unittest/cj_ui_ability_test/BUILD.gn +++ b/test/unittest/cj_ui_ability_test/BUILD.gn @@ -68,7 +68,7 @@ ohos_unittest("cj_ui_ability_test") { "${ability_runtime_path}/frameworks/cj/ffi:cj_ability_ffi", "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_path}/utils/global/freeze:freeze_util", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/unittest/dialog_session_manager_test/BUILD.gn b/test/unittest/dialog_session_manager_test/BUILD.gn index c11b6a069b7..17d35b78219 100644 --- a/test/unittest/dialog_session_manager_test/BUILD.gn +++ b/test/unittest/dialog_session_manager_test/BUILD.gn @@ -52,7 +52,6 @@ ohos_unittest("dialog_session_manager_test") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/ets_ui_ability_instance_test/BUILD.gn b/test/unittest/ets_ui_ability_instance_test/BUILD.gn index 77446d0f8b1..c45c1bafd86 100644 --- a/test/unittest/ets_ui_ability_instance_test/BUILD.gn +++ b/test/unittest/ets_ui_ability_instance_test/BUILD.gn @@ -48,7 +48,6 @@ ohos_unittest("ets_ui_ability_instance_test") { "${ability_runtime_native_path}/insight_intent/insight_intent_context:insightintentcontext", "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", ] external_deps = [ diff --git a/test/unittest/event_report_test/BUILD.gn b/test/unittest/event_report_test/BUILD.gn index d6604556123..adca538819f 100755 --- a/test/unittest/event_report_test/BUILD.gn +++ b/test/unittest/event_report_test/BUILD.gn @@ -21,7 +21,7 @@ ohos_unittest("event_report_test") { sources = [ "event_report_test.cpp" ] - deps = [ "${ability_runtime_services_path}/common:event_report" ] + deps = [ "${ability_runtime_services_path}/common:app_util" ] external_deps = [ "hisysevent:libhisysevent", diff --git a/test/unittest/file_permission_manager_test/BUILD.gn b/test/unittest/file_permission_manager_test/BUILD.gn index 0a4d58141b6..20cf1edc9d1 100644 --- a/test/unittest/file_permission_manager_test/BUILD.gn +++ b/test/unittest/file_permission_manager_test/BUILD.gn @@ -47,7 +47,7 @@ ohos_unittest("file_permission_manager_test") { deps = [ "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr", "${ability_runtime_native_path}/appkit:appkit_manager_helper", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/uripermmgr:libupms_static", ] diff --git a/test/unittest/frameworks_kits_ability_native_test/BUILD.gn b/test/unittest/frameworks_kits_ability_native_test/BUILD.gn index 4d8fb03781c..6a541eddae3 100644 --- a/test/unittest/frameworks_kits_ability_native_test/BUILD.gn +++ b/test/unittest/frameworks_kits_ability_native_test/BUILD.gn @@ -2466,7 +2466,7 @@ ohos_unittest("ability_impl_factory_test") { "${ability_runtime_native_path}/appkit:appkit_delegator", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn b/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn index c650e1b6bb9..d392a785fe8 100644 --- a/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn +++ b/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn @@ -1088,7 +1088,7 @@ ohos_unittest("native_lib_util_test") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/appkit:appkit_native", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ @@ -1171,7 +1171,7 @@ ohos_unittest("startup_manager_test") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/appkit:appkit_native", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ @@ -1232,7 +1232,7 @@ ohos_unittest("startup_manager_mock_test") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/appkit:appkit_native", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/unittest/hitrace_chain_utils_test/BUILD.gn b/test/unittest/hitrace_chain_utils_test/BUILD.gn index ed47e8de73c..514513bbe7b 100644 --- a/test/unittest/hitrace_chain_utils_test/BUILD.gn +++ b/test/unittest/hitrace_chain_utils_test/BUILD.gn @@ -27,7 +27,7 @@ ohos_unittest("hitrace_chain_utils_test") { sources = [ "hitrace_chain_utils_test.cpp" ] - deps = [ "${ability_runtime_services_path}/common:hitrace_chain_util" ] + deps = [ "${ability_runtime_services_path}/common:app_util" ] external_deps = [ "c_utils:utils", diff --git a/test/unittest/insight_intent/insight_intent_execute_callback_stub_test/BUILD.gn b/test/unittest/insight_intent/insight_intent_execute_callback_stub_test/BUILD.gn index 46ddb25c3ca..bfaeadce00b 100644 --- a/test/unittest/insight_intent/insight_intent_execute_callback_stub_test/BUILD.gn +++ b/test/unittest/insight_intent/insight_intent_execute_callback_stub_test/BUILD.gn @@ -41,7 +41,7 @@ ohos_unittest("insight_intent_execute_callback_stub_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/appkit:appkit_manager_helper", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/unittest/insight_intent/insight_intent_execute_manager_second_test/BUILD.gn b/test/unittest/insight_intent/insight_intent_execute_manager_second_test/BUILD.gn index 83f137e6c1d..bcca7ee3c34 100644 --- a/test/unittest/insight_intent/insight_intent_execute_manager_second_test/BUILD.gn +++ b/test/unittest/insight_intent/insight_intent_execute_manager_second_test/BUILD.gn @@ -51,7 +51,7 @@ ohos_unittest("insight_intent_execute_manager_second_test") { deps = [ "${ability_runtime_native_path}/appkit:appkit_manager_helper", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/unittest/insight_intent/insight_intent_execute_manager_test/BUILD.gn b/test/unittest/insight_intent/insight_intent_execute_manager_test/BUILD.gn index f86d5978557..786b879f757 100644 --- a/test/unittest/insight_intent/insight_intent_execute_manager_test/BUILD.gn +++ b/test/unittest/insight_intent/insight_intent_execute_manager_test/BUILD.gn @@ -44,7 +44,7 @@ ohos_unittest("insight_intent_execute_manager_test") { deps = [ "${ability_runtime_native_path}/appkit:appkit_manager_helper", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/unittest/insight_intent/insight_intent_sys_event_receiver_test/BUILD.gn b/test/unittest/insight_intent/insight_intent_sys_event_receiver_test/BUILD.gn index be5ebe8f78f..34d09811674 100644 --- a/test/unittest/insight_intent/insight_intent_sys_event_receiver_test/BUILD.gn +++ b/test/unittest/insight_intent/insight_intent_sys_event_receiver_test/BUILD.gn @@ -50,7 +50,7 @@ ohos_unittest("insight_intent_sys_event_receiver_test") { deps = [ "${ability_runtime_native_path}/appkit:appkit_manager_helper", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/unittest/insight_intent/insight_intent_utils_test/BUILD.gn b/test/unittest/insight_intent/insight_intent_utils_test/BUILD.gn index 88c0ecdfda1..6e837117631 100644 --- a/test/unittest/insight_intent/insight_intent_utils_test/BUILD.gn +++ b/test/unittest/insight_intent/insight_intent_utils_test/BUILD.gn @@ -50,9 +50,7 @@ ohos_unittest("insight_intent_utils_test") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/js_ui_ability_test/BUILD.gn b/test/unittest/js_ui_ability_test/BUILD.gn index 94a64bd0ddd..02b03b8bc5c 100644 --- a/test/unittest/js_ui_ability_test/BUILD.gn +++ b/test/unittest/js_ui_ability_test/BUILD.gn @@ -53,7 +53,7 @@ ohos_unittest("js_ui_ability_test") { "${ability_runtime_path}/frameworks/native/ability/native:continuation_ipc", "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_path}/utils/global/freeze:freeze_util", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", ] external_deps = [ diff --git a/test/unittest/kiosk_manager_test/BUILD.gn b/test/unittest/kiosk_manager_test/BUILD.gn index bc4ddad0a8f..e558bf5c4a8 100644 --- a/test/unittest/kiosk_manager_test/BUILD.gn +++ b/test/unittest/kiosk_manager_test/BUILD.gn @@ -86,7 +86,6 @@ ohos_unittest("kiosk_manager_test") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", ] 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 dd6c945fd00..a66d9019d76 100644 --- a/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn +++ b/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn @@ -51,7 +51,6 @@ ohos_unittest("modal_system_app_freeze_uiextension_test") { "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:res_sched_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/native_child_process_test/BUILD.gn b/test/unittest/native_child_process_test/BUILD.gn index 1bf9176c2ca..c1eede9045b 100644 --- a/test/unittest/native_child_process_test/BUILD.gn +++ b/test/unittest/native_child_process_test/BUILD.gn @@ -72,7 +72,6 @@ ohos_unittest("native_child_process_test") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/query_erms_manager_test/BUILD.gn b/test/unittest/query_erms_manager_test/BUILD.gn index 4414b8678fd..0ff3e718c7c 100644 --- a/test/unittest/query_erms_manager_test/BUILD.gn +++ b/test/unittest/query_erms_manager_test/BUILD.gn @@ -9,7 +9,7 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -# limitations under the License. +# limitations under the License. import("//build/test.gni") import("//foundation/ability/ability_runtime/ability_runtime.gni") @@ -42,7 +42,7 @@ ohos_unittest("query_erms_manager_test") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/query_erms_observer_manager_test/BUILD.gn b/test/unittest/query_erms_observer_manager_test/BUILD.gn index b712e63e5e2..33a0ba7b96d 100644 --- a/test/unittest/query_erms_observer_manager_test/BUILD.gn +++ b/test/unittest/query_erms_observer_manager_test/BUILD.gn @@ -38,7 +38,7 @@ ohos_unittest("query_erms_observer_manager_test") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/rate_limiter_test/BUILD.gn b/test/unittest/rate_limiter_test/BUILD.gn index 9695a5bcc70..a72e2400a8f 100644 --- a/test/unittest/rate_limiter_test/BUILD.gn +++ b/test/unittest/rate_limiter_test/BUILD.gn @@ -27,7 +27,7 @@ ohos_unittest("rate_limiter_test") { sources = [ "rate_limiter_test.cpp" ] - deps = [ "${ability_runtime_services_path}/common:rate_limiter" ] + deps = [ "${ability_runtime_services_path}/common:app_util" ] external_deps = [ "c_utils:utils", diff --git a/test/unittest/report_data_partition_usage_manager_test/BUILD.gn b/test/unittest/report_data_partition_usage_manager_test/BUILD.gn index 02ab9750d35..444a073fd2e 100644 --- a/test/unittest/report_data_partition_usage_manager_test/BUILD.gn +++ b/test/unittest/report_data_partition_usage_manager_test/BUILD.gn @@ -38,7 +38,7 @@ ohos_unittest("report_data_partition_usage_manager_test") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/res_sched_util_test/BUILD.gn b/test/unittest/res_sched_util_test/BUILD.gn index 9bddfe792f1..49d0f56e588 100644 --- a/test/unittest/res_sched_util_test/BUILD.gn +++ b/test/unittest/res_sched_util_test/BUILD.gn @@ -27,7 +27,7 @@ ohos_unittest("res_sched_util_test") { sources = [ "res_sched_util_test.cpp" ] - deps = [ "${ability_runtime_services_path}/common:res_sched_util" ] + deps = [ "${ability_runtime_services_path}/common:app_util" ] external_deps = [ "ability_runtime:abilitykit_native", diff --git a/test/unittest/sa_interceptor_manager_test/BUILD.gn b/test/unittest/sa_interceptor_manager_test/BUILD.gn index 07b5efc6ea2..9d1c84ef61d 100644 --- a/test/unittest/sa_interceptor_manager_test/BUILD.gn +++ b/test/unittest/sa_interceptor_manager_test/BUILD.gn @@ -41,7 +41,7 @@ ohos_unittest("sa_interceptor_manager_test") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/sa_interceptor_proxy_test/BUILD.gn b/test/unittest/sa_interceptor_proxy_test/BUILD.gn index dfc416b2235..aa943fa1dba 100644 --- a/test/unittest/sa_interceptor_proxy_test/BUILD.gn +++ b/test/unittest/sa_interceptor_proxy_test/BUILD.gn @@ -37,7 +37,7 @@ ohos_unittest("sa_interceptor_proxy_test") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/sa_interceptor_stub_test/BUILD.gn b/test/unittest/sa_interceptor_stub_test/BUILD.gn index e19a6492a48..71a2ec97926 100644 --- a/test/unittest/sa_interceptor_stub_test/BUILD.gn +++ b/test/unittest/sa_interceptor_stub_test/BUILD.gn @@ -34,7 +34,7 @@ ohos_unittest("sa_interceptor_stub_test") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/screen_unlock_interceptor_test/BUILD.gn b/test/unittest/screen_unlock_interceptor_test/BUILD.gn index 493164aa5f7..2cc6a489dc9 100644 --- a/test/unittest/screen_unlock_interceptor_test/BUILD.gn +++ b/test/unittest/screen_unlock_interceptor_test/BUILD.gn @@ -51,7 +51,6 @@ ohos_unittest("screen_unlock_interceptor_test") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", ] external_deps = [ diff --git a/test/unittest/status_bar_delegate_manager_test/BUILD.gn b/test/unittest/status_bar_delegate_manager_test/BUILD.gn index 5e7e4c26c5f..5fb460317f2 100644 --- a/test/unittest/status_bar_delegate_manager_test/BUILD.gn +++ b/test/unittest/status_bar_delegate_manager_test/BUILD.gn @@ -59,7 +59,6 @@ ohos_unittest("status_bar_delegate_manager_test") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] 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 3942668ac81..9ddaf1dc4a2 100644 --- a/test/unittest/ui_ability_lifecycle_manager_second_test/BUILD.gn +++ b/test/unittest/ui_ability_lifecycle_manager_second_test/BUILD.gn @@ -70,7 +70,6 @@ ohos_unittest("ui_ability_lifecycle_manager_second_test") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/ui_ability_lifecycle_manager_test/BUILD.gn b/test/unittest/ui_ability_lifecycle_manager_test/BUILD.gn index dafdb7a015f..a9e8116224a 100644 --- a/test/unittest/ui_ability_lifecycle_manager_test/BUILD.gn +++ b/test/unittest/ui_ability_lifecycle_manager_test/BUILD.gn @@ -64,7 +64,6 @@ ohos_unittest("ui_ability_lifecycle_manager_test") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] 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 7268d7e63de..b2c9a7a5ed0 100644 --- a/test/unittest/ui_ability_lifecycle_manager_third_test/BUILD.gn +++ b/test/unittest/ui_ability_lifecycle_manager_third_test/BUILD.gn @@ -71,7 +71,6 @@ ohos_unittest("ui_ability_lifecycle_manager_third_test") { "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", - "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/uri_perm_mgr_test/BUILD.gn b/test/unittest/uri_perm_mgr_test/BUILD.gn index 10938bea029..ede6133f48e 100644 --- a/test/unittest/uri_perm_mgr_test/BUILD.gn +++ b/test/unittest/uri_perm_mgr_test/BUILD.gn @@ -51,7 +51,7 @@ ohos_unittest("uri_perm_mgr_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr", "${ability_runtime_native_path}/appkit:appkit_manager_helper", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/uripermmgr:libupms_static", ] diff --git a/test/unittest/uri_permission_impl_test/BUILD.gn b/test/unittest/uri_permission_impl_test/BUILD.gn index 939e088f604..22e7b0afb0c 100755 --- a/test/unittest/uri_permission_impl_test/BUILD.gn +++ b/test/unittest/uri_permission_impl_test/BUILD.gn @@ -58,7 +58,7 @@ ohos_unittest("uri_permission_impl_test") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr", "${ability_runtime_native_path}/appkit:appkit_manager_helper", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/uripermmgr:libupms_static", ] @@ -128,7 +128,6 @@ ohos_unittest("uri_permission_manager_stub_impl_test") { "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/uripermmgr:libupms_static", ] diff --git a/test/unittest/uri_permission_test/BUILD.gn b/test/unittest/uri_permission_test/BUILD.gn index 2f569c16886..e20dce2c843 100755 --- a/test/unittest/uri_permission_test/BUILD.gn +++ b/test/unittest/uri_permission_test/BUILD.gn @@ -38,7 +38,7 @@ ohos_unittest("uri_permission_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr", "${ability_runtime_native_path}/appkit:appkit_manager_helper", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/uripermmgr:libupms_static", ] diff --git a/test/unittest/uri_permission_utils_test/BUILD.gn b/test/unittest/uri_permission_utils_test/BUILD.gn index 9d11ad9d3c9..adf6f09aff5 100644 --- a/test/unittest/uri_permission_utils_test/BUILD.gn +++ b/test/unittest/uri_permission_utils_test/BUILD.gn @@ -37,7 +37,7 @@ ohos_unittest("uri_permission_utils_test") { deps = [ "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr", "${ability_runtime_native_path}/appkit:appkit_manager_helper", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/uripermmgr:libupms_static", ] @@ -86,7 +86,6 @@ ohos_unittest("uri_permission_utils_new_test") { "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/uripermmgr:libupms_static", ] diff --git a/test/unittest/uri_utils_second_test/BUILD.gn b/test/unittest/uri_utils_second_test/BUILD.gn index 26bd69da54a..d81d471ee98 100644 --- a/test/unittest/uri_utils_second_test/BUILD.gn +++ b/test/unittest/uri_utils_second_test/BUILD.gn @@ -52,7 +52,6 @@ ohos_unittest("uri_utils_second_test") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report", ] external_deps = [ diff --git a/test/unittest/uri_utils_test/BUILD.gn b/test/unittest/uri_utils_test/BUILD.gn index 438d6b81f21..d0261c3933c 100644 --- a/test/unittest/uri_utils_test/BUILD.gn +++ b/test/unittest/uri_utils_test/BUILD.gn @@ -47,7 +47,6 @@ ohos_unittest("uri_utils_test") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:event_report" ] external_deps = [ diff --git a/test/unittest/window_visibility_changed_listener_test/BUILD.gn b/test/unittest/window_visibility_changed_listener_test/BUILD.gn index b60e32473d8..9b28bb2c632 100644 --- a/test/unittest/window_visibility_changed_listener_test/BUILD.gn +++ b/test/unittest/window_visibility_changed_listener_test/BUILD.gn @@ -36,7 +36,7 @@ ohos_unittest("window_visibility_changed_listener_test") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_services_path}/appmgr:libappms", - "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", ] -- Gitee