diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn index 5b726de3034672d0b20c6599ef7f3c6eccc23d26..e3d0ba6a31583fd7818bb15bbc8139315dfe017e 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 797f152348baf7962d41d73e565db6cd339401cc..6bc3a281e0b477456a65f0b8d6d45dda41e6e61f 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 6a962b3e5bc4becfafd2e80ecd9def572c71dd7d..30b5d65620ee8757cf4cc99d9874ee249971da95 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 d83479d9bdfde680cff04a0cdafedcf0ddfe955e..0d9ba5684c22f56ec77f5fc4b1b16066277bfc12 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 e01a8cad3b14bd83dee76897afe910e27668ac24..f48ae958b58dd0a85f4b938677dc7a5fa090bce3 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 18ef4f73c9e858590e3835b6a53a6a62f3e0f5c4..324a80085244a8974aa435691faae05652f2cfcb 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 aed6a37f028c177862cbca07accecb679484e319..c00db08a815b40b243b082135b3d4711d2e5593c 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 860fc328741a425f46f845b18632053482ccb13f..ecb477dd0d55153012a7be8c75a6879f0b85a42d 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 b9d6640df6bd381647646dd476c29e9e337b77c4..f47a98db4b4dfd426e728ae0436c4f36c01b5786 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 42fc60e83007eb7a2fcc96842ae771635857bb6b..620f29931772ae781c15d473c962f8ea20a3a9d5 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 50b810f4fa1c2d21a141f3d918da2f4d704b6543..045d6e623067d4e1187a9bad1f37da85033488f2 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 53cc9005caff4747ed370fca13f00d1dee2c20f9..288cfbad10848f9ad8ba65c057b7ab85fc22d5ca 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 91b7629f1a4e2f15f3b1ed1983b3bb5cf9dc3429..413f90d1c8fbfd68641e6a25b2e9b3db4a5403c5 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 4bf94474fa3db8148f038fd7bcf8ac8708c277be..db754d09ee32b77e471babb26eab10c262c43ef1 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 8da7714bac11084f14983d506c27cbcddb5a07b3..2f35b7104696968c1eb89eba182a53722072d10e 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 9982985c15aafdf4585ad6bcd3211fab430816c3..0108a6980c294f9bc7bf25b6d8024780905e4a3d 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 32a5c85235f14b0dbcf6c5b320b22d1b12f23f62..c4b90ea3d8c877484ee670ffdb71e1fd3d2a8f08 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 ecafbd30b60968daf90c56d507449609ad900467..2f424b56c1b9adc265b42a5bce611590b07c84af 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 f9948ac813b609088f19bc23932b361555c5a294..b79c8c338ddc6f24f6cf546220473d310af89888 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 3380a300f89f174e09a7362bed18c4b6e87b1d11..ded0c095bd653f71e01bfbb5bfdaa77904a7a76f 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 13aa68a7d6e668513d146bb3b9978a0992edd278..4112c8bc720618e7f499ee0754d0d396062241e2 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 0ba4c186642a4590f061047defb2041deef4a264..126febd38d6d5d7c9bebb8a4ac8caae4b5dd2f02 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 8dc80ad4481e0fa9fc0c7dacb4275b5a2a3abb15..06085e95e27d2b0eca28692ab18e1e29ed272c6f 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 48a124b732fbfa1db5b89d305a5fb8aa5797fa52..fcba215186760964c0c97677485e2fd1ceea4f1a 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 4ae2a07e9306ae0468d99c58a49e0cc586d407be..0cdfcd5c3b8ab29d55dc090897a9babb10055b8c 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 14f7982daf15a0a08ab0a79792b298062a55b27d..e641494bc4c012f16a47d5e074e152b2f9b233b0 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 b9515b6872dcdc63eec8bd54034e54a96abfb386..e61fe921cecafde0778e7677b937084800328dfd 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 cb815bf317c08e6b1856483dc0732699b0c9acf9..4a5f9149a7cb7583cffbddaf3735b28396b0896d 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 32bf75cdd8142e7aa97b2b34102414583dc7a930..fd944ac29d17cc0c8dc546f0b927a435730f0d29 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 65582f901a0267bba6fc6a577ab3981385891604..b2f75552c7ec18f5eaeafed965d0bacd0758b6ba 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 e2e99632a7ae0e63eb819fa58ecdab4b03602b3c..4f4698b146730c3ffff7adbd2065a1b6732e89ee 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 24974375c8faf08feaee40907b11303df08dad8a..c2b42dd14e271ce9b73a7ee7bbc6bf6f2169e09a 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 63f9807a935a2de52885760d4ce643ca351c153f..ea5819bb1b563fb72475623e1b4731547296d6af 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 52e0e169eaad7ff2fa3e3b135b96fa9b22315a64..3f8f0f34754cb13d3244e523e9da8552a4045d69 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 64d20fa7d020a34a9a08955ba8516c21ed590668..387da7002d0b92e21bbc38ee17b9b3c39c4130e0 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 39fdca3deac74fe1a7c5ad0267fbeebe536cc77a..5a275f3dfc1cc9519a8983f1641a5ed38a8df825 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 2b2d2d882a1c644cd893c1bda7337113d8a067a6..06a4a959d9f4304148cb2d7d5519b6b816d3be45 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 59b08590d335e5aa2b136cde8ee9336b6e51e676..181525c6ce5e5b0505bb6fd990c19efba2ff2c7d 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 a90f941ce083976df89de502aa2dad9c42ad6305..e734c3e63a6f39b5b667451a913336424be2dc99 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 f4ec5bf813b6dfbe6075bd856a8153a69e7ec01b..80e5a2060a5a2c2ace0f92712f729f92f620f120 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 48c3944b2778d46992cbb1d5f79374703787f3d2..ebdfc7905bf49984910e604b6aaa8aebbc2aca5c 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 97b82a07142f29e4087a2eeb7792a3320e264392..83199dd197da7fe21100a481c22726807dcf3f49 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 7196e59e83a7ace5b5e95782c1bb2393357b861f..38321088a32d3ab2bef224972cf5c815d1adef0d 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 0bccb3b546e3fa09ad7016ae75e62025581196f7..f3a81aae382e88086e8b1a8c612190ac4cf88acf 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 759511eb962f3d0cf25e10b0622f1ba166846bc3..6dddef100904b72edc0a604af6586bba5b496605 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 72b90c87f6d0fc19b06031e4a9d969a109bd0432..f9b70f14537c6fdf98f452526b3457d494e51a65 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 1acebb0cd6952d7feebca75edddfefec7692f11d..154a2a9d4c522021b8dae0311a821b657a34f18e 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 720b00bc490ac601cd2ee04fd5723b2fd6a69eb3..d5cf7248cc6771c592cfa07b613a0e1f3ce5be61 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 6721a19e7ebca8e5c0b64ff45f1299a6aedb4c18..c6c12df6eafb303b11506379e7437be75482221a 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 ebecb1b7992981cc3214740db7b3117c0ae78fad..c3c0302ee6a304733d3c6f6c4d06409f085baacf 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 992ba12030a3e01ecf779aa1d58f03104dc5870f..741264a18b7fa1bc1a63d169d5756ef35a1f4410 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 24d5bf9a3ec70ee5d16648abf13f66c5e88e326c..697de09865f8fa409938065aff5e9219090e56d8 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 60e8956a96764dcb14f918c93c90bda1fb361297..e355294fcabe521f2697c73e887ae45fcc0be29b 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 245d98c4f01a3da300b8bb9f24525061e733bd44..f2c9615a278ba8526c9747b92761ec63a7aa5f47 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 d1fbca3d6f0673e7959e68b7a23c42e914eac62d..e885ccf5a6c7713ef598e4e5256b9d33304f2617 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 9a41ae9d754efba4dbb591d1947e5989afbfd2ed..7254bf589f7f92bbd132b5e08a3aa8dcb7cf9b51 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 effd5e6d6f74f418b0f2c0fb2486a8dae20d365f..28796765143ddb57512b4034a2c9738bfac69e9e 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 9689d74f1b51e057bcf9901c1a73c784eaa08071..9f94ce7c3e2def30beab2da40a2b6b7e4d690586 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 8f3185e86e175ca71316cc958ecd36a4461ccb6a..e9432dd09c6b7270edc329360c80f10c9396186d 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 92bf5be75cb7dfd5f0b6551e1a865cef4949f0fe..d720893a39ac178ec6703e9c9b9be76bf62e44df 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 e91af62f92da8337acc4ee8a5f034f38c57926cf..c99e89097e13c3ac99c9da151ca5d85eeab96e9e 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 6536a7c81eef9cabedb0d7fa98612970df646f5e..c382c9733ab3ee0efd345c18edfbe4407d38295e 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 5812d791db007c0fba4f3a1e93353020dbfc3153..ac837f764bf57b6f85f822561f7f6f2e45d92eeb 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 0eb45cfceecff0124b92abcb521462d685b9a264..b9443976baa079b4c3d5432834ea88b28da206a9 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 b59638976588616ce35a4eea9b3865b2149e87ef..6ececf2d66399c64a02f30a537220f526927c9aa 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 cce726809bbcf1dabe88ed674e364a849d24407e..a3c6641f01abaf73377351b051462e86bb744d2c 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 452dc8bd5c3a2732c171a767fa59d475ddd07c75..159ab868a27af759ab01605bf87d3ad93808440a 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 31a405ca3887b19e4d6a5d87670c43fd9805a9fa..3e2313dd1fc47f432da36dc37029bc3db868fba0 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 81b99d53d7c242e28383540edc9056273a843ecc..e332547bf0e0ccbd96872db597045030c1913d11 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 c8712a741a3dd827c650c89c0852926eba1cfd38..e898bfdfde523b60ad7e33149104d02f45bce042 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 a4d09d987de94a3bf363b27edb405c0b74669ff0..c900ad28e1efeb4d6c6dc6d4dacfbcad5dc631c1 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 2d4c140cd04e8b022d9dad07d4167e753373354a..8f705391d9e5d239004ffe3127149a37808a6aa1 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 0528a8c68261f395e2bae35aa90df2dde60aa345..bbb219becb1a770f04af2227ea927f013827f5cb 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 7b1e3be494af6fd5b858184dd9b8ed5480b5ece5..9e927b970a5a8b27905d6a0a472cb6ac3c5469bc 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 6f326eeea24ecb2fb8daab7ba1fc582fdf8d84bc..d422ab68be8008fb48d217c8ab24ac0d469fcff0 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 3184a5ee67ff42805d881bc792d5764083b9a239..e17ae25e1999ab4d089eccde2734c7a1fa4594a0 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 d4cbe09ed8568a81907ea126c751f68e056891af..21f58dbd60c7456a3e42531266403d196c88bef2 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 106783e490d1b1f75de52d6bd14c7d38a3bf844c..23fa739bfb1c66e3a52ea41d1d44c42ca9dc456c 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 c92f2ae1cd8197fb7f424d1ce26e5566475bec75..b7e18da688108442947223512a9471856015128a 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 39acaf93772a386b0e414fc2f83bbad6d58d04e4..2c22b6f5faa119dd2ab368882d7cd744c9f88bd7 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 f5f3810d2bde5f7e9850c8815d1e6c1201236b4a..dd58f932259e11d50ccbb1cf79ded0717fbad2c2 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 71eca609330643d4a4e7f7fbe55364bc13999d8b..39316c10150a420b72de09bfc69dc1e35e2aab97 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 24665f4056a54b6f0aff38326194fac6bf988a08..43ceb9fa1635947881a56c519bca1925d1788879 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 7064b15201a53c9f35327d0bf5871ab0138e5b1f..6394d64828599056d2a658e0aee4d1733a82e7ee 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 61c2a129d0f3abd65b18faec13b4257692a71543..596c1cc6c87a52776900fb1703e6502ceb825dac 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 b38dcdd82d18b81d5d0df55c7f2a65ee867f2551..bb2fd036ae7b761e65191d7fdab06eee4f6abe1c 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 58a0b0303e29f8aa4a54196b581f88c4889749f1..add508279f4f8431b446397d93296952b6908598 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 d60d2ca04414d1682d0cd85273824e101a108bf8..b38527c65ce61d4315ad92bb4fbdb7af2c8ce65b 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 0077518b672026a69b6c78526b9563b60adbaf38..328d4b35f7656de84c05f563087d908947f76f97 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 b8c94365e88edcfc81ce2ade37d82cbed0e470e8..a31022ebc118d91dab0a9fc467a8ee10f78f50df 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 8ceefa8055c7d923c4ebc6224413b0caf76bb508..acf535fff366719b95bc67769a021e3d45761417 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 1ba09810280931b979425742af54467ae8f5d225..aa36d882ad8fcb792f89883525aee9035d1c26ea 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 b6c3f8eef32e2271742955e12caec3b6a1e4c808..98e532b5e1e225764c9e1a666e02b04ecbcb8c58 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 613f79b7725bcab4b5ecaf1443ceb7f2f3c969bf..a81d5083478e41aa8c9db90d549290e7ba484d9f 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 b07301aff62a3029274da5923d3f3276382ee8c5..a96496f2c60aedd26aa0e52da9736dfd495dfa2b 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 845eeea20c9422c5e27a29dc7c141e0890f1ac1d..d9fc1413dd064c200f09a265cc517c76746abe8b 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 0fd6a0dcf2872f7ca12a1aa6982922bc0f4a05db..acda1fcc5428f50deaa9965e90596135712e2a91 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 12890423f5e6b5599c806c81bd2ac64faf93ca43..2095d98081e8efbd6187f298a5134b92d837e38f 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 d7fb3a42d7166c5172304f0c8eee55d3b68bf488..0722f73fe0a57d13e59f43cdb44078b8470e8b05 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 f10ab814e2e7a9227e83a473b61b8ca99d567b81..efb2348f1adcd6feaae0edbf404e0ec4f8e8aa0b 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 3acb0107ed8c1dcc4961c14d323eb66a78326b68..d14961741622152322cd7fb27b81022b27947598 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 136073f96b8d6f709f71467ef183ca64947c4ce9..c5c221c0d5f7c236219d0e03d8893a1f7c7ec12e 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 7f2e88f18266a9295eda80fde09822b15d06bbba..53b7850edcd616d8f1aa4645d014da69ba4e47a1 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 f7de5c202a705979c3487afd21e006f435a29209..9cce713d9b6819a3c92c8d1f7fe7a65e079caae6 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 0ad3739a084add947741d41ba8114a71778b38aa..e213c737c51789071ea6521680351891cb1ae8e2 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 b5a2dfff8d49a54ae944140dfaec6392041c32a4..fdc70948f075ad4d4027fff25286499a89bafbbd 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 e8bb5daeb20988e74b8d22b65a1f4c320d5e4761..7efebcf22e0f6e06de2926494312dde7e5d75aaa 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 091c787c0dfec6c0be08a84da5b059570088862b..b34d460c87cf24d69dff5db8a0d39c845af6bb72 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 8272bd4e7998e2afd509958fc48b8eaff83492d6..3fb6ea9180b389b008e3bf214c93a660bdd0c341 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 327b3b48b7eeafda894f7bbb134a6495e4368c76..c24a584bdbf89b45896dd2efae3222138424a759 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 385e3559555ecefbc18655cb062b91ff31058a6e..92c045211bf3d8310dd8ba5681e4c3c7ec7176e9 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 cb44f0c6333ee1fa88b9743f9df8f096dbd18792..239bdce2b7a8ef3a264a3ca160ed088e4eab53ff 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 74ff4798688416aae7f58b154a8b98e8759c0f42..1bb5b4cc77bdbaba14ddf2e9cd9a81cf4b227167 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 5a2b87d7530fbd4313001ba7e24da2ad6362db97..86cd43e87fbbacbbdf32cdb46d3d0b65539776db 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 abdaff267147eab126fea0fb932c64aabe3bd769..528ae4897a06b0f0c66cd5cddeb94044381b6608 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 176c8e288990f1dd1abaf38a098cfe62247e01ac..f6b2f9e4674af5f1e2ce25b889e7e2716cf38f11 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 7e9b86f4e81eb22aa31d365428f8a6a681d1f961..26e3a5dfcf35de2d8e69dbdadc427671669b86bc 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 a2dc318f64938da07d6eb5db6bf9510477365386..4810717530f7cf7fb8980539347a432176c14895 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 3191a2b593426edc3e2a4c140d7e9e4800f0484f..0599c2c0ac9d8ee8ead092f27b4a2d147b2d34d0 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 3996cf2801a9d5517d4751f3949a330b576ef58b..358889240d3346e4a107a4332c4555629158ff29 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 577e74add1d8cc6ec2ac2830b3573b2e7f5f88ae..6ac252fdbbf72cd2f64f9dbed594ad5ce0991198 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 c11b6a069b7f8655fad9aaa24cbc0ec186348b28..17d35b782197dd5a2eb9a62c0eae3d139f45f344 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 77446d0f8b136a9d9ddfc1f8bbb8011343bf236a..c45c1bafd86322016fda0c0080f6d845f9aab086 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 d66045561236b2bc83e0982bb7eb2d90373c8ff8..adca538819f4a176b6b588bc29ca267e99502006 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 0a4d58141b69d814d7e142402a7e914dd34441de..20cf1edc9d1cb57e280da57adea6aab3a59a1ef6 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 4d8fb03781c408871f7149b849556b6935b38962..6a541eddae362a485a062791d0b550d9bf007965 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 c650e1b6bb98929274ca2de09ce83eaff1ceb4d1..d392a785fe8e1f7d6e139d1e3c4c425c99152279 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 ed47e8de73cf43b5e397470ca23912f373348bd8..514513bbe7b2219dec7a256f361a92ea440718a0 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 46ddb25c3ca2022fe29c5d14a0486a05f69c8a52..bfaeadce00bc4f9846ca8012a143b4dde00b3174 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 83f137e6c1d208785d5b1910fe76a51cbc6b7832..bcca7ee3c3471c7778d4a2acf880bf2022ffde5f 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 f86d59785574d28fa7ae878e2963229cc194a98b..786b879f757aa69eb13d1ff1cac88eed7bfdbffa 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 be5ebe8f78fdbe126bf5c7fef6b57bb31f1506c2..34d0981167490d2cd9f278293b7e68d016c24827 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 88c0ecdfda1c0fa5af1ea6a04c9241bebd43aca3..6e8371176312cbfc51a0348d79e8b8cbfc80941c 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 94a64bd0ddd97c70af2f1c6cce097310eeb80c8b..02b03b8bc5cdd7b0e299ff1854a53f8ee0fd3852 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 bc4ddad0a8f13f6862b3077032ca01986c09e5a1..e558bf5c4a8e1f97bafcadd9efa99529c535e50b 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 dd6c945fd002c403019e514eac35cf5e5e23fd86..a66d9019d76ad9e4300fcb6e433d1ccc74c7af27 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 1bf9176c2cadb6fb08547b85ee17d4d9e8e18087..c1eede9045bebbb0714d5bcf1568ed51ba3fdb56 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 4414b8678fd158a7d2e5c32ebc0fbd8a53481c94..0ff3e718c7c0a784e8030041a36c5474cce2fa41 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 b712e63e5e2fef35d5bd6833da1ea90af991c096..33a0ba7b96da338986df36e2772207c72c4ed837 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 9695a5bcc709ff8c42a6c6a23667cd3f09dad38c..a72e2400a8f0fe7ac9ba6353c21887d77f34139e 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 02ab9750d35b449ed2aa9d86d568a5843dd40575..444a073fd2e0db7f09f011279ee1af6c1df29b07 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 9bddfe792f1a033db2a9dbed1fddf68f6c3c004d..49d0f56e58832911584fb69bc4f3125e801b3fea 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 07b5efc6ea2809677b3c0d005e320d17af36f1a9..9d1c84ef61d8299254e618b9409e3aa33071f4c9 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 dfc416b2235ce62e712eea6db2113dc395d63810..aa943fa1dba6b11178ddae43e0354016d9dfa381 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 e19a6492a485ea77e5e08bb3688da3395b42217d..71a2ec97926f7fec5e167d5be0376a8b104f09ed 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 493164aa5f71aed74f3a860b65e21af07c28c5b7..2cc6a489dc9645bfa0204f1951c4db030f17a629 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 5e7e4c26c5f140da3557c7e1909a1aa674143faf..5fb460317f2d4c72da081f1311d298ba48b063b0 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 3942668ac8172481b48a98e8c4aadb9f7b6c9fed..9ddaf1dc4a2ce81927ed186bb68a8b3d47ca3f97 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 dafdb7a015ff2e5e1a94a0f17689d763059b717c..a9e8116224a5221d9337ed9383696b7cf63c33b3 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 7268d7e63def4c4d321946494b75d4c7dbe40322..b2c9a7a5ed05f5da8d30823b464cb08e4ba0f0be 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 10938bea0296325e2acea090f045cc474aa4eabd..ede6133f48e2dbb930a906869d6ccd02ffddbc90 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 939e088f60463af48984dd5a673bc066930a5de4..22e7b0afb0c3c48e25c0be7ead8409c74d59062e 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 2f569c16886c37daf5cb8b9e579537d00ff8efa7..e20dce2c843d336d2f0a10f836021521531caf1c 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 9d11ad9d3c9de4816ccfa62c71ccc50dc53aa934..adf6f09aff51ffc94d75a4d744a518b944820a58 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 26bd69da54a1297658d648e0ecc31cfdacd677fa..d81d471ee98e790561ffd8843c077c5e1d4bb884 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 438d6b81f2179e3bb5a915c7392cc6fe6d59db77..d0261c3933cba7a2d8d346418ab4eaa32e1b870c 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 b60e32473d85811cea9cd726537945cd2f8221e2..9b28bb2c63234d4a9d75a923b2ed803e26981280 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", ]