From 36ae30edd0ec9ca39752ba723cedeaafbafa75c2 Mon Sep 17 00:00:00 2001 From: yangxuguang-huawei Date: Tue, 22 Oct 2024 14:54:21 +0800 Subject: [PATCH] refactor: move utils to utils folder Signed-off-by: yangxuguang-huawei --- frameworks/js/napi/wantagent/BUILD.gn | 1 + .../wantagent/ability_want_agent/BUILD.gn | 1 + frameworks/native/ability/native/BUILD.gn | 6 +++++ frameworks/native/appkit/BUILD.gn | 1 + interfaces/inner_api/ability_manager/BUILD.gn | 1 + .../inner_api/extension_manager/BUILD.gn | 1 + interfaces/inner_api/wantagent/BUILD.gn | 1 + services/abilitymgr/BUILD.gn | 2 ++ services/abilitymgr/abilitymgr.gni | 22 +++++++++---------- .../include/{ => utils}/ability_event_util.h | 0 .../include/{ => utils}/ability_util.h | 0 .../include/{ => utils}/application_util.h | 0 .../include/{ => utils}/dlp_utils.h | 0 .../include/{ => utils}/start_ability_utils.h | 0 .../include/{ => utils}/uri_utils.h | 0 services/abilitymgr/libabilityms.map | 21 ++++++++++++++---- .../src/{ => utils}/ability_event_util.cpp | 0 .../src/{ => utils}/insight_intent_utils.cpp | 0 .../src/{ => utils}/start_ability_utils.cpp | 0 .../abilitymgr/src/{ => utils}/uri_utils.cpp | 0 .../abilityappfreezemanager_fuzzer/BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../abilityautostartupclient_fuzzer/BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../fuzztest/abilitydebugdeal_fuzzer/BUILD.gn | 1 + .../fuzztest/abilityeventutil_fuzzer/BUILD.gn | 3 ++- .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 3 ++- .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 3 ++- .../BUILD.gn | 1 + .../abilitymgrextensionrecord_fuzzer/BUILD.gn | 1 + .../BUILD.gn | 3 ++- .../BUILD.gn | 3 ++- .../BUILD.gn | 3 ++- .../BUILD.gn | 3 ++- .../abilitymgrjumpinterceptor_fuzzer/BUILD.gn | 3 ++- .../BUILD.gn | 1 + .../abilitymgrrdbparserutil_fuzzer/BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../fuzztest/assertfaultproxy_fuzzer/BUILD.gn | 1 + test/fuzztest/autostartupinfo_fuzzer/BUILD.gn | 1 + .../dialogsessioninfo_fuzzer/BUILD.gn | 1 + .../dialogsessionmanager_fuzzer/BUILD.gn | 4 +++- .../fuzztest/disposedobserver_fuzzer/BUILD.gn | 1 + test/fuzztest/extensionconfig_fuzzer/BUILD.gn | 1 + .../BUILD.gn | 2 +- .../extensionpermissionsutil_fuzzer/BUILD.gn | 1 + .../extensionrecordfactory_fuzzer/BUILD.gn | 1 + .../extensionrecordmanager_fuzzer/BUILD.gn | 1 + test/fuzztest/freezeutil_fuzzer/BUILD.gn | 3 ++- test/fuzztest/openlinkoptions_fuzzer/BUILD.gn | 3 ++- .../screenunlockinterceptor_fuzzer/BUILD.gn | 4 +++- .../startabilityutils_fuzzer/BUILD.gn | 2 +- .../startotherappinterceptor_fuzzer/BUILD.gn | 4 +++- .../statusbardelegatemanager_fuzzer/BUILD.gn | 3 ++- .../uiextensionrecordfactory_fuzzer/BUILD.gn | 1 + .../appmgr_test_service/BUILD.gn | 1 + .../libs/aakit/BUILD.gn | 1 + .../libs/appexecfwk_core/BUILD.gn | 1 + .../ability_delegator_test/BUILD.gn | 1 + test/moduletest/ability_test/BUILD.gn | 1 + .../ability_timeout_module_test/BUILD.gn | 2 +- .../running_infos_module_test/BUILD.gn | 2 +- test/unittest/BUILD.gn | 6 ++--- .../BUILD.gn | 2 +- .../unittest/ability_debug_deal_test/BUILD.gn | 1 + .../ability_debug_response_stub_test/BUILD.gn | 1 + .../BUILD.gn | 1 + .../ability_interceptor_second_test/BUILD.gn | 3 ++- .../ability_interceptor_test/BUILD.gn | 3 ++- .../ability_interceptor_third_test/BUILD.gn | 3 ++- .../BUILD.gn | 1 + .../BUILD.gn | 3 ++- .../BUILD.gn | 3 ++- .../ability_running_info_test/BUILD.gn | 1 + test/unittest/ams_mgr_proxy_test/BUILD.gn | 1 + test/unittest/ams_mgr_stub_test/BUILD.gn | 1 + .../unittest/app_lifecycle_deal_test/BUILD.gn | 1 + .../app_mgr_client_first_test/BUILD.gn | 1 + test/unittest/app_mgr_client_test/BUILD.gn | 1 + .../BUILD.gn | 1 + .../app_mgr_service_inner_tdd_test/BUILD.gn | 2 ++ .../app_mgr_service_inner_test/BUILD.gn | 2 ++ test/unittest/app_scheduler_test/BUILD.gn | 2 ++ .../BUILD.gn | 2 ++ .../BUILD.gn | 2 ++ .../BUILD.gn | 2 ++ .../dialog_session_manager_test/BUILD.gn | 3 ++- test/unittest/dump_utils_test/BUILD.gn | 1 - .../BUILD.gn | 2 +- .../extension_permissions_util_test/BUILD.gn | 2 ++ test/unittest/fault_data/BUILD.gn | 2 ++ .../BUILD.gn | 8 +++++++ .../ability_delegator/BUILD.gn | 2 ++ .../implicit_start_processor_test/BUILD.gn | 2 ++ .../insight_intent_utils_test/BUILD.gn | 4 +++- .../BUILD.gn | 2 ++ .../BUILD.gn | 2 ++ .../unittest/main_element_utils_test/BUILD.gn | 1 + test/unittest/multi_app_utils_test/BUILD.gn | 2 ++ .../os_account_manager_wrapper_test/BUILD.gn | 2 ++ test/unittest/pending_want_test/BUILD.gn | 2 ++ .../photo_editor_extension_a_test/BUILD.gn | 2 ++ .../photo_editor_extension_test/BUILD.gn | 2 ++ .../BUILD.gn | 1 + .../resident_process_manager_test/BUILD.gn | 1 + .../start_other_app_interceptor_test/BUILD.gn | 2 ++ test/unittest/unlock_screen_test/BUILD.gn | 2 ++ test/unittest/want_agent_helper_test/BUILD.gn | 2 ++ test/unittest/want_utils_test/BUILD.gn | 2 ++ test/unittest/window_config_test/BUILD.gn | 1 + .../window_options_utils_test/BUILD.gn | 3 +++ tools/aa/BUILD.gn | 1 + 126 files changed, 204 insertions(+), 46 deletions(-) rename services/abilitymgr/include/{ => utils}/ability_event_util.h (100%) rename services/abilitymgr/include/{ => utils}/ability_util.h (100%) rename services/abilitymgr/include/{ => utils}/application_util.h (100%) rename services/abilitymgr/include/{ => utils}/dlp_utils.h (100%) rename services/abilitymgr/include/{ => utils}/start_ability_utils.h (100%) rename services/abilitymgr/include/{ => utils}/uri_utils.h (100%) rename services/abilitymgr/src/{ => utils}/ability_event_util.cpp (100%) rename services/abilitymgr/src/{ => utils}/insight_intent_utils.cpp (100%) rename services/abilitymgr/src/{ => utils}/start_ability_utils.cpp (100%) rename services/abilitymgr/src/{ => utils}/uri_utils.cpp (100%) diff --git a/frameworks/js/napi/wantagent/BUILD.gn b/frameworks/js/napi/wantagent/BUILD.gn index 84c4f45c58..f1c7d4e1dd 100644 --- a/frameworks/js/napi/wantagent/BUILD.gn +++ b/frameworks/js/napi/wantagent/BUILD.gn @@ -18,6 +18,7 @@ ohos_shared_library("wantagent") { include_dirs = [ "${ability_runtime_services_path}/common/include", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "./", ] diff --git a/frameworks/js/napi/wantagent/ability_want_agent/BUILD.gn b/frameworks/js/napi/wantagent/ability_want_agent/BUILD.gn index f0bcccc58d..7d5cdc0f83 100644 --- a/frameworks/js/napi/wantagent/ability_want_agent/BUILD.gn +++ b/frameworks/js/napi/wantagent/ability_want_agent/BUILD.gn @@ -18,6 +18,7 @@ ohos_shared_library("wantagent_napi") { include_dirs = [ "${ability_runtime_services_path}/common/include", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "./", "../", diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn index d2fcbd47b8..cc79b4d994 100644 --- a/frameworks/native/ability/native/BUILD.gn +++ b/frameworks/native/ability/native/BUILD.gn @@ -34,6 +34,7 @@ config("ability_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/app", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", "${ability_runtime_innerkits_path}/uri/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app", "${ability_runtime_innerkits_path}/ability_manager/include/continuation", @@ -130,6 +131,7 @@ ohos_shared_library("abilitykit_utils") { "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app", "${ability_runtime_innerkits_path}/ability_manager/include", "${ability_runtime_innerkits_path}/wantagent/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", ] @@ -206,6 +208,7 @@ ohos_shared_library("configuration_helper") { "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app", "${ability_runtime_innerkits_path}/ability_manager/include", "${ability_runtime_innerkits_path}/wantagent/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", ] @@ -570,6 +573,7 @@ config("uiability_config") { "${ability_runtime_path}/interfaces/kits/native/ability/native/recovery/", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app", "${ability_runtime_path}/interfaces/kits/native/appkit/app", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] @@ -1057,6 +1061,7 @@ ohos_shared_library("ui_service_extension_module") { "${ability_runtime_path}/interfaces/kits/native/ability/native/recovery/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", "${ability_runtime_innerkits_path}/uri/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_innerkits_path}/ability_manager/include/continuation", "${ability_runtime_innerkits_path}/ability_manager/include", @@ -1699,6 +1704,7 @@ config("embedded_ui_extension_module_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/app", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", "${ability_runtime_innerkits_path}/uri/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app", "${ability_runtime_path}/interfaces/kits/native/appkit/app", diff --git a/frameworks/native/appkit/BUILD.gn b/frameworks/native/appkit/BUILD.gn index f27a4a7939..89be0b3eff 100644 --- a/frameworks/native/appkit/BUILD.gn +++ b/frameworks/native/appkit/BUILD.gn @@ -88,6 +88,7 @@ ohos_shared_library("appkit_native") { "${ability_runtime_path}/interfaces/kits/native/ability/native", "${ability_runtime_path}/interfaces/kits/native/ability/native/recovery", "${ability_runtime_path}/utils/global/time/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_napi_path}/inner/napi_common", "${ability_runtime_utils_path}/global/constant", diff --git a/interfaces/inner_api/ability_manager/BUILD.gn b/interfaces/inner_api/ability_manager/BUILD.gn index 1ee172034b..1a529afb18 100644 --- a/interfaces/inner_api/ability_manager/BUILD.gn +++ b/interfaces/inner_api/ability_manager/BUILD.gn @@ -384,6 +384,7 @@ ohos_shared_library("ability_connect_callback_stub") { include_dirs = [ "include/", "${ability_base_kits_path}/want/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", ] diff --git a/interfaces/inner_api/extension_manager/BUILD.gn b/interfaces/inner_api/extension_manager/BUILD.gn index fed2a7131e..2a0d85fb82 100755 --- a/interfaces/inner_api/extension_manager/BUILD.gn +++ b/interfaces/inner_api/extension_manager/BUILD.gn @@ -29,6 +29,7 @@ config("extension_manager_config") { visibility = [ ":*" ] include_dirs = [ + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", ] diff --git a/interfaces/inner_api/wantagent/BUILD.gn b/interfaces/inner_api/wantagent/BUILD.gn index 2f48232987..233470af9f 100644 --- a/interfaces/inner_api/wantagent/BUILD.gn +++ b/interfaces/inner_api/wantagent/BUILD.gn @@ -33,6 +33,7 @@ config("wantagent_innerkits_public_config") { "${ability_runtime_path}/interfaces/kits/native/ability/native", "${ability_runtime_innerkits_path}/ability_manager/include", "${ability_runtime_innerkits_path}/wantagent/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", "${ability_runtime_path}/interfaces/kits/native/appkit/app", diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index a03d551dbc..77c22d1b96 100644 --- a/services/abilitymgr/BUILD.gn +++ b/services/abilitymgr/BUILD.gn @@ -256,6 +256,7 @@ ohos_shared_library("wantagent_manager") { branch_protector_ret = "pac_ret" include_dirs = [ "${ability_runtime_services_path}/abilitymgr/data_ability/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_innerkits_path}/ability_manager/include", "${ability_runtime_services_path}/common/include", @@ -348,6 +349,7 @@ ohos_shared_library("mission_list") { "${ability_runtime_path}/interfaces/kits/native/ability/native", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_bundle_manager_helper", "${ability_runtime_services_path}/abilitymgr/data_ability/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/abilitymgr/include/mission", "${ability_runtime_services_path}/common/include", diff --git a/services/abilitymgr/abilitymgr.gni b/services/abilitymgr/abilitymgr.gni index 0bccdcef18..89c22ee97e 100644 --- a/services/abilitymgr/abilitymgr.gni +++ b/services/abilitymgr/abilitymgr.gni @@ -52,7 +52,6 @@ abilityms_files = [ "src/pending_want_common_event.cpp", "src/restart_app_manager.cpp", "src/ams_configuration_parameter.cpp", - "src/insight_intent_utils.cpp", "src/insight_intent_profile.cpp", "src/recovery_info_timer.cpp", "src/modal_system_dialog/modal_system_dialog_ui_extension.cpp", @@ -66,13 +65,11 @@ abilityms_files = [ "src/interceptor/extension_control_interceptor.cpp", "src/interceptor/screen_unlock_interceptor.cpp", "src/interceptor/start_other_app_interceptor.cpp", - "src/uri_utils.cpp", "src/window_focus_changed_listener.cpp", # start ability handler "src/start_ability_handler.cpp", "src/start_ability_handler/start_ability_sandbox_savefile.cpp", - "src/start_ability_utils.cpp", # new ability manager service here "src/extension_record_manager.cpp", @@ -119,7 +116,6 @@ abilityms_files = [ "src/resident_process/resident_process_manager.cpp", "src/ability_bundle_event_callback.cpp", - "src/ability_event_util.cpp", "src/app_exit_reason_data_manager.cpp", @@ -132,18 +128,22 @@ abilityms_files = [ "src/ability_manager_event_subscriber.cpp", #utils - "src/utils/window_options_utils.cpp", - "src/utils/want_utils.cpp", - "src/utils/state_utils.cpp", - "src/utils/extension_permissions_util.cpp", - "src/utils/app_mgr_util.cpp", - "src/utils/main_element_utils.cpp", - "src/utils/dump_utils.cpp", + "src/utils/ability_event_util.cpp", "src/utils/ability_permission_util.cpp", + "src/utils/app_mgr_util.cpp", + "src/utils/dump_utils.cpp", + "src/utils/extension_permissions_util.cpp", + "src/utils/insight_intent_utils.cpp", + "src/utils/main_element_utils.cpp", "src/utils/modal_system_dialog_util.cpp", "src/utils/multi_app_utils.cpp", "src/utils/multi_instance_utils.cpp", + "src/utils/start_ability_utils.cpp", + "src/utils/state_utils.cpp", "src/utils/update_caller_info_util.cpp", + "src/utils/uri_utils.cpp", + "src/utils/want_utils.cpp", + "src/utils/window_options_utils.cpp", ] if (ability_runtime_graphics) { diff --git a/services/abilitymgr/include/ability_event_util.h b/services/abilitymgr/include/utils/ability_event_util.h similarity index 100% rename from services/abilitymgr/include/ability_event_util.h rename to services/abilitymgr/include/utils/ability_event_util.h diff --git a/services/abilitymgr/include/ability_util.h b/services/abilitymgr/include/utils/ability_util.h similarity index 100% rename from services/abilitymgr/include/ability_util.h rename to services/abilitymgr/include/utils/ability_util.h diff --git a/services/abilitymgr/include/application_util.h b/services/abilitymgr/include/utils/application_util.h similarity index 100% rename from services/abilitymgr/include/application_util.h rename to services/abilitymgr/include/utils/application_util.h diff --git a/services/abilitymgr/include/dlp_utils.h b/services/abilitymgr/include/utils/dlp_utils.h similarity index 100% rename from services/abilitymgr/include/dlp_utils.h rename to services/abilitymgr/include/utils/dlp_utils.h diff --git a/services/abilitymgr/include/start_ability_utils.h b/services/abilitymgr/include/utils/start_ability_utils.h similarity index 100% rename from services/abilitymgr/include/start_ability_utils.h rename to services/abilitymgr/include/utils/start_ability_utils.h diff --git a/services/abilitymgr/include/uri_utils.h b/services/abilitymgr/include/utils/uri_utils.h similarity index 100% rename from services/abilitymgr/include/uri_utils.h rename to services/abilitymgr/include/utils/uri_utils.h diff --git a/services/abilitymgr/libabilityms.map b/services/abilitymgr/libabilityms.map index 983da22be4..a4d90394f4 100644 --- a/services/abilitymgr/libabilityms.map +++ b/services/abilitymgr/libabilityms.map @@ -19,8 +19,11 @@ *AbilityConnectionStub*; *AbilityConnectManager*; *AbilityEventHandler*; + *AbilityEventUtil*; *AbilityFirstFrameStateObserverManager*; *AbilityInterceptorExecuter*; + *AbilityJumpInterceptor*; + *AbilityManagerProxy*; *AbilityManagerService*; *AbilityManagerStub*; *AbilityPermissionUtil*; @@ -31,6 +34,7 @@ *AmsConfigurationParameter*; *AppExitReasonDataManager*; *ApplicationAnrListener*; + *AppMgrUtil*; *AppScheduler*; *AtomicServiceStatusCallback*; *BackgroundTaskObserver*; @@ -38,6 +42,7 @@ *CallContainer*; *CallerInfo*; *CallerRecord*; + *CallRecord*; *ConnectionObserverController*; *ConnectionRecord*; *ConnectionStateItem*; @@ -45,14 +50,17 @@ *ConnectionManagerClient*; *ControlInterceptor*; *CrowdTestInterceptor*; + *DeepLinkReserveConfig*; *DisposedRuleInterceptor*; + *DumpUtils*; *EcologicalRuleInterceptor*; - *AbilityJumpInterceptor*; + *ExtensionPermissionsUtil*; *DataAbilityManager*; *FreeInstallManager*; *FreeInstallObserverManager*; *ImplicitStartProcessor*; *InnerMissionInfo*; + *InsightIntentUtils*; *LaunchParam*; *LifeCycleStateInfo*; *Mission*; @@ -63,29 +71,34 @@ *MissionListenerStub*; *MissionListManager*; *MissionSnapshot*; + *ModalSystemDialogUtil*; + *MultiAppUtils*; *MultiInstanceUtils*; *PendingWantKey*; *PendingWantManager*; *PendingWantRecord*; *ResidentProcessManager*; + *StartAbilityUtils*; *StartOptions*; + *StateUtils*; *SystemDialogScheduler*; *TaskDataPersistenceMgr*; *Token*; + *UpdateCallerInfoUtil*; + *UriUtils*; *UserController*; *UnlockScreenManager*; *WantSenderInfo*; *SenderInfo*; - *AbilityManagerProxy*; *ExtensionRunningInfo*; *UserCallbackStub*; *UserItem*; *WantReceiverStub*; - *CallRecord*; *WantReceiverProxy*; *WantSenderProxy*; *WantSenderStub*; - *DeepLinkReserveConfig*; + *WantUtils*; + *WindowOptionsUtils*; }; local: *; diff --git a/services/abilitymgr/src/ability_event_util.cpp b/services/abilitymgr/src/utils/ability_event_util.cpp similarity index 100% rename from services/abilitymgr/src/ability_event_util.cpp rename to services/abilitymgr/src/utils/ability_event_util.cpp diff --git a/services/abilitymgr/src/insight_intent_utils.cpp b/services/abilitymgr/src/utils/insight_intent_utils.cpp similarity index 100% rename from services/abilitymgr/src/insight_intent_utils.cpp rename to services/abilitymgr/src/utils/insight_intent_utils.cpp diff --git a/services/abilitymgr/src/start_ability_utils.cpp b/services/abilitymgr/src/utils/start_ability_utils.cpp similarity index 100% rename from services/abilitymgr/src/start_ability_utils.cpp rename to services/abilitymgr/src/utils/start_ability_utils.cpp diff --git a/services/abilitymgr/src/uri_utils.cpp b/services/abilitymgr/src/utils/uri_utils.cpp similarity index 100% rename from services/abilitymgr/src/uri_utils.cpp rename to services/abilitymgr/src/utils/uri_utils.cpp diff --git a/test/fuzztest/abilityappfreezemanager_fuzzer/BUILD.gn b/test/fuzztest/abilityappfreezemanager_fuzzer/BUILD.gn index 2de16a652f..2f9e254017 100644 --- a/test/fuzztest/abilityappfreezemanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityappfreezemanager_fuzzer/BUILD.gn @@ -23,6 +23,7 @@ ohos_fuzztest("AbilityAppFreezeManagerFuzzTest") { "${ability_runtime_test_path}/fuzztest/abilityappfreezemanager_fuzzer" include_dirs = [ "${ability_runtime_services_path}/appmgr/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/appdfr/include", "${ability_runtime_path}/utils/global/freeze/include", diff --git a/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn b/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn index 2c58b843d6..391ac11d75 100644 --- a/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn @@ -29,6 +29,7 @@ ohos_fuzztest("AbilityAppMgrAppRunningManagerFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/appmgr/include", "${ability_runtime_services_path}/common/include", diff --git a/test/fuzztest/abilityappmgrpagestatedata_fuzzer/BUILD.gn b/test/fuzztest/abilityappmgrpagestatedata_fuzzer/BUILD.gn index e211bd6309..5b7bc6efb7 100644 --- a/test/fuzztest/abilityappmgrpagestatedata_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityappmgrpagestatedata_fuzzer/BUILD.gn @@ -22,6 +22,7 @@ ohos_fuzztest("AbilityAppMgrPageStateDataFuzzTest") { "${ability_runtime_test_path}/fuzztest/abilityappmgrpagestatedata_fuzzer" include_dirs = [ "${ability_runtime_services_path}/appmgr/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] diff --git a/test/fuzztest/abilityappmgrrenderstatedata_fuzzer/BUILD.gn b/test/fuzztest/abilityappmgrrenderstatedata_fuzzer/BUILD.gn index c785b8e7c9..1432f70a7b 100644 --- a/test/fuzztest/abilityappmgrrenderstatedata_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityappmgrrenderstatedata_fuzzer/BUILD.gn @@ -21,6 +21,7 @@ ohos_fuzztest("AbilityAppMgrRenderStateDataFuzzTest") { fuzz_config_file = "${ability_runtime_test_path}/fuzztest/abilityappmgrrenderstatedata_fuzzer" include_dirs = [ "${ability_runtime_services_path}/appmgr/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] diff --git a/test/fuzztest/abilityappmgrrenderstateobservermanager_fuzzer/BUILD.gn b/test/fuzztest/abilityappmgrrenderstateobservermanager_fuzzer/BUILD.gn index 44f816bf99..1c7698d087 100644 --- a/test/fuzztest/abilityappmgrrenderstateobservermanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityappmgrrenderstateobservermanager_fuzzer/BUILD.gn @@ -29,6 +29,7 @@ ohos_fuzztest("AbilityAppMgrRenderStateObserverManagerFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/appmgr/include", "${ability_runtime_services_path}/common/include", diff --git a/test/fuzztest/abilityappmgrrunningmultiinfo_fuzzer/BUILD.gn b/test/fuzztest/abilityappmgrrunningmultiinfo_fuzzer/BUILD.gn index 97e92e0444..2b7be3e0ad 100644 --- a/test/fuzztest/abilityappmgrrunningmultiinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityappmgrrunningmultiinfo_fuzzer/BUILD.gn @@ -21,6 +21,7 @@ ohos_fuzztest("AbilityAppMgrRunningMultiInfoFuzzTest") { fuzz_config_file = "${ability_runtime_test_path}/fuzztest/abilityappmgrrunningmultiinfo_fuzzer" include_dirs = [ "${ability_runtime_services_path}/appmgr/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] diff --git a/test/fuzztest/abilityautostartupclient_fuzzer/BUILD.gn b/test/fuzztest/abilityautostartupclient_fuzzer/BUILD.gn index 73fc4cad27..a0e5c6650f 100644 --- a/test/fuzztest/abilityautostartupclient_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityautostartupclient_fuzzer/BUILD.gn @@ -26,6 +26,7 @@ ohos_fuzztest("AbilityAutoStartupClientFuzzTest") { "${ability_runtime_test_path}/fuzztest/abilityautostartupclient_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/abilityautostartupdatamanager_fuzzer/BUILD.gn b/test/fuzztest/abilityautostartupdatamanager_fuzzer/BUILD.gn index 395521956d..f41703a5e4 100644 --- a/test/fuzztest/abilityautostartupdatamanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityautostartupdatamanager_fuzzer/BUILD.gn @@ -25,6 +25,7 @@ ohos_fuzztest("AbilityAutoStartupDataManagerFuzzTest") { fuzz_config_file = "${ability_runtime_test_path}/fuzztest/abilityautostartupdatamanager_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/abilitybackgroundconnection_fuzzer/BUILD.gn b/test/fuzztest/abilitybackgroundconnection_fuzzer/BUILD.gn index ba3aa4c52e..068dff81c1 100644 --- a/test/fuzztest/abilitybackgroundconnection_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitybackgroundconnection_fuzzer/BUILD.gn @@ -26,6 +26,7 @@ ohos_fuzztest("AbilityBackgroundConnectionFuzzTest") { "${ability_runtime_test_path}/fuzztest/abilitybackgroundconnection_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/abilitydebugdeal_fuzzer/BUILD.gn b/test/fuzztest/abilitydebugdeal_fuzzer/BUILD.gn index 538d9650de..f9c6a7be98 100644 --- a/test/fuzztest/abilitydebugdeal_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitydebugdeal_fuzzer/BUILD.gn @@ -26,6 +26,7 @@ ohos_fuzztest("AbilityDebugDealFuzzTest") { "${ability_runtime_test_path}/fuzztest/abilitydebugdeal_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", ] diff --git a/test/fuzztest/abilityeventutil_fuzzer/BUILD.gn b/test/fuzztest/abilityeventutil_fuzzer/BUILD.gn index 8f25606141..4d7c5f98ce 100644 --- a/test/fuzztest/abilityeventutil_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityeventutil_fuzzer/BUILD.gn @@ -26,6 +26,7 @@ ohos_fuzztest("AbilityEventUtilFuzzTest") { "${ability_runtime_test_path}/fuzztest/abilityeventutil_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ @@ -35,7 +36,7 @@ ohos_fuzztest("AbilityEventUtilFuzzTest") { "-fno-omit-frame-pointer", ] sources = [ - "${ability_runtime_services_path}/abilitymgr/src/ability_event_util.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp", "abilityeventutil_fuzzer.cpp", ] diff --git a/test/fuzztest/abilityfirstframestateobservermanager_fuzzer/BUILD.gn b/test/fuzztest/abilityfirstframestateobservermanager_fuzzer/BUILD.gn index 68d10d64f4..42c0c1b4bb 100644 --- a/test/fuzztest/abilityfirstframestateobservermanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityfirstframestateobservermanager_fuzzer/BUILD.gn @@ -25,6 +25,7 @@ ohos_fuzztest("AbilityFirstFrameStateObserverManagerFuzzTest") { fuzz_config_file = "${ability_runtime_test_path}/fuzztest/abilityfirstframestateobservermanager_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", ] diff --git a/test/fuzztest/abilityframeworkscjenvironment_fuzzer/BUILD.gn b/test/fuzztest/abilityframeworkscjenvironment_fuzzer/BUILD.gn index 42de5ca11d..61d1a30558 100644 --- a/test/fuzztest/abilityframeworkscjenvironment_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityframeworkscjenvironment_fuzzer/BUILD.gn @@ -34,6 +34,7 @@ ohos_fuzztest("AbilityFrameworksCjEnvironmentFuzzTest") { "${ability_base_kits_path}/extractortool/include", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_bundle_manager_helper", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", diff --git a/test/fuzztest/abilityframeworksnativejsworker_fuzzer/BUILD.gn b/test/fuzztest/abilityframeworksnativejsworker_fuzzer/BUILD.gn index a0c9399bb4..dc28eeb996 100644 --- a/test/fuzztest/abilityframeworksnativejsworker_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityframeworksnativejsworker_fuzzer/BUILD.gn @@ -34,6 +34,7 @@ ohos_fuzztest("AbilityFrameworksNativeJsWorkerFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "//third_party/zlib/contrib/minizip", "//third_party/zlib", diff --git a/test/fuzztest/abilityframeworksnativeohosjsenvlogger_fuzzer/BUILD.gn b/test/fuzztest/abilityframeworksnativeohosjsenvlogger_fuzzer/BUILD.gn index 74223bc3d1..4716affc92 100644 --- a/test/fuzztest/abilityframeworksnativeohosjsenvlogger_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityframeworksnativeohosjsenvlogger_fuzzer/BUILD.gn @@ -36,6 +36,7 @@ ohos_fuzztest("AbilityFrameworksNativeOhosJsEnvLoggerFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "//third_party/zlib/contrib/minizip", "//third_party/zlib", @@ -49,7 +50,7 @@ ohos_fuzztest("AbilityFrameworksNativeOhosJsEnvLoggerFuzzTest") { ] sources = [ "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp", - "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp", "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp", "abilityframeworksnativeohosjsenvlogger_fuzzer.cpp", ] diff --git a/test/fuzztest/abilitymanagereventsubscriber_fuzzer/BUILD.gn b/test/fuzztest/abilitymanagereventsubscriber_fuzzer/BUILD.gn index dd465e3d02..b15f210da0 100644 --- a/test/fuzztest/abilitymanagereventsubscriber_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymanagereventsubscriber_fuzzer/BUILD.gn @@ -25,6 +25,7 @@ ohos_fuzztest("AbilityManagerEventSubscriberFuzzTest") { fuzz_config_file = "${ability_runtime_test_path}/fuzztest/abilitymanagereventsubscriber_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/abilitymgrabilitymanagerstub_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrabilitymanagerstub_fuzzer/BUILD.gn index eec6ffc222..0ebe3c6e2a 100644 --- a/test/fuzztest/abilitymgrabilitymanagerstub_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrabilitymanagerstub_fuzzer/BUILD.gn @@ -27,6 +27,7 @@ ohos_fuzztest("AbilityMgrAbilityManagerStubFuzzTest") { include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/appkit/ability_bundle_manager_helper", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${ability_runtime_path}/interfaces/kits/native/session_info/include", diff --git a/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn index 124ea675e8..97e1a13a0e 100644 --- a/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn @@ -30,6 +30,7 @@ ohos_fuzztest("AbilityMgrAppExitReasonHelperFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/abilitymgr/include/scene_board", "${ability_runtime_services_path}/abilitymgr/include/mission", diff --git a/test/fuzztest/abilitymgrcontrolinterceptor_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrcontrolinterceptor_fuzzer/BUILD.gn index 3cd6129a6e..b49a2cc71c 100644 --- a/test/fuzztest/abilitymgrcontrolinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrcontrolinterceptor_fuzzer/BUILD.gn @@ -29,6 +29,7 @@ ohos_fuzztest("AbilityMgrControlInterceptorFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ @@ -39,7 +40,7 @@ ohos_fuzztest("AbilityMgrControlInterceptorFuzzTest") { ] sources = [ "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp", - "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp", "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp", "abilitymgrcontrolinterceptor_fuzzer.cpp", ] diff --git a/test/fuzztest/abilitymgrecologicalrulemgrserviceparam_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrecologicalrulemgrserviceparam_fuzzer/BUILD.gn index a1d7b3776d..26cd11d409 100644 --- a/test/fuzztest/abilitymgrecologicalrulemgrserviceparam_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrecologicalrulemgrserviceparam_fuzzer/BUILD.gn @@ -29,6 +29,7 @@ ohos_fuzztest("AbilityMgrEcologicalRuleMgrServiceParamFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn index ab0f19e944..ea102e42a9 100644 --- a/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn @@ -30,6 +30,7 @@ ohos_fuzztest("AbilityMgrExtensionRecordFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn index aa3f01083a..0ded5e3d97 100644 --- a/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn @@ -29,6 +29,7 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteManagerFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ @@ -40,7 +41,7 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteManagerFuzzTest") { sources = [ "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_manager.cpp", "${ability_runtime_services_path}/abilitymgr/src/insight_intent_profile.cpp", - "${ability_runtime_services_path}/abilitymgr/src/insight_intent_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp", "abilitymgrinsightintentexecutemanager_fuzzer.cpp", ] diff --git a/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn index d9bdaff7e7..b5f6aa35e7 100644 --- a/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn @@ -29,6 +29,7 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteResultFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ @@ -40,7 +41,7 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteResultFuzzTest") { sources = [ "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_result.cpp", "${ability_runtime_services_path}/abilitymgr/src/insight_intent_profile.cpp", - "${ability_runtime_services_path}/abilitymgr/src/insight_intent_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp", "abilitymgrinsightintentexecuteresult_fuzzer.cpp", ] diff --git a/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn index fa1f42046b..a44635d814 100644 --- a/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn @@ -29,6 +29,7 @@ ohos_fuzztest("AbilityMgrInsightIntentUtilsFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ @@ -40,7 +41,7 @@ ohos_fuzztest("AbilityMgrInsightIntentUtilsFuzzTest") { sources = [ "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_result.cpp", "${ability_runtime_services_path}/abilitymgr/src/insight_intent_profile.cpp", - "${ability_runtime_services_path}/abilitymgr/src/insight_intent_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp", "abilitymgrinsightintentutils_fuzzer.cpp", ] diff --git a/test/fuzztest/abilitymgrinterceptorexecuter_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinterceptorexecuter_fuzzer/BUILD.gn index bd07414d60..d96dbf77d8 100644 --- a/test/fuzztest/abilitymgrinterceptorexecuter_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinterceptorexecuter_fuzzer/BUILD.gn @@ -29,6 +29,7 @@ ohos_fuzztest("AbilityMgrInterceptorExecuterFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ @@ -39,7 +40,7 @@ ohos_fuzztest("AbilityMgrInterceptorExecuterFuzzTest") { ] sources = [ "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp", - "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp", "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp", "abilitymgrinterceptorexecuter_fuzzer.cpp", ] diff --git a/test/fuzztest/abilitymgrjumpinterceptor_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrjumpinterceptor_fuzzer/BUILD.gn index 0d988d3bb7..8d72f925d0 100644 --- a/test/fuzztest/abilitymgrjumpinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrjumpinterceptor_fuzzer/BUILD.gn @@ -30,6 +30,7 @@ ohos_fuzztest("AbilityMgrJumpInterceptorFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ @@ -40,7 +41,7 @@ ohos_fuzztest("AbilityMgrJumpInterceptorFuzzTest") { ] sources = [ "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp", - "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp", "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp", "abilitymgrjumpinterceptor_fuzzer.cpp", ] diff --git a/test/fuzztest/abilitymgrpreloaduiextstateobserver_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrpreloaduiextstateobserver_fuzzer/BUILD.gn index fd6419cdca..0037340799 100644 --- a/test/fuzztest/abilitymgrpreloaduiextstateobserver_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrpreloaduiextstateobserver_fuzzer/BUILD.gn @@ -25,6 +25,7 @@ ohos_fuzztest("AbilitymgrPreloadUiextStateObserverFuzzTest") { fuzz_config_file = "${ability_runtime_test_path}/fuzztest/abilitymgrpreloaduiextstateobserver_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn index f05f03a987..8d91eecfdc 100644 --- a/test/fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn @@ -30,6 +30,7 @@ ohos_fuzztest("AbilityMgrRdbParserUtilFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/abilitymgr/include/rdb", ] diff --git a/test/fuzztest/abilitymgrrestartappmanager_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrrestartappmanager_fuzzer/BUILD.gn index d5bf300c62..1daa742873 100644 --- a/test/fuzztest/abilitymgrrestartappmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrrestartappmanager_fuzzer/BUILD.gn @@ -26,6 +26,7 @@ ohos_fuzztest("AbilitymgrRestartAppManagerFuzzTest") { "${ability_runtime_test_path}/fuzztest/abilitymgrrestartappmanager_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn b/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn index d6d95f9371..57ff739d79 100644 --- a/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn @@ -30,6 +30,7 @@ ohos_fuzztest("AbilityMgrUiExtensionRecordFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/abilitymgruiextensionsessioninfo_fuzzer/BUILD.gn b/test/fuzztest/abilitymgruiextensionsessioninfo_fuzzer/BUILD.gn index 7d39e116a5..1e3a0b71e1 100644 --- a/test/fuzztest/abilitymgruiextensionsessioninfo_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgruiextensionsessioninfo_fuzzer/BUILD.gn @@ -25,6 +25,7 @@ ohos_fuzztest("AbilitymgrUiExtensionSessionInfoFuzzTest") { fuzz_config_file = "${ability_runtime_test_path}/fuzztest/abilitymgruiextensionsessioninfo_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/assertfaultcallbackdeathmgr_fuzzer/BUILD.gn b/test/fuzztest/assertfaultcallbackdeathmgr_fuzzer/BUILD.gn index d97805ef37..02eb683672 100644 --- a/test/fuzztest/assertfaultcallbackdeathmgr_fuzzer/BUILD.gn +++ b/test/fuzztest/assertfaultcallbackdeathmgr_fuzzer/BUILD.gn @@ -26,6 +26,7 @@ ohos_fuzztest("AssertFaultCallbackDeathMgrFuzzTest") { "${ability_runtime_test_path}/fuzztest/assertfaultcallbackdeathmgr_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/assertfaultproxy_fuzzer/BUILD.gn b/test/fuzztest/assertfaultproxy_fuzzer/BUILD.gn index bf1c3cca6e..2a470593f3 100644 --- a/test/fuzztest/assertfaultproxy_fuzzer/BUILD.gn +++ b/test/fuzztest/assertfaultproxy_fuzzer/BUILD.gn @@ -26,6 +26,7 @@ ohos_fuzztest("AssertFaultProxyFuzzTest") { "${ability_runtime_test_path}/fuzztest/assertfaultproxy_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/autostartupinfo_fuzzer/BUILD.gn b/test/fuzztest/autostartupinfo_fuzzer/BUILD.gn index e5ad593681..8fcf6756c8 100644 --- a/test/fuzztest/autostartupinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/autostartupinfo_fuzzer/BUILD.gn @@ -26,6 +26,7 @@ ohos_fuzztest("AutoStartupInfoFuzzTest") { "${ability_runtime_test_path}/fuzztest/autostartupinfo_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/dialogsessioninfo_fuzzer/BUILD.gn b/test/fuzztest/dialogsessioninfo_fuzzer/BUILD.gn index 2bcc724651..f02ecbc9c5 100644 --- a/test/fuzztest/dialogsessioninfo_fuzzer/BUILD.gn +++ b/test/fuzztest/dialogsessioninfo_fuzzer/BUILD.gn @@ -26,6 +26,7 @@ ohos_fuzztest("DialogSessionInfoFuzzTest") { "${ability_runtime_test_path}/fuzztest/dialogsessioninfo_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/dialogsessionmanager_fuzzer/BUILD.gn b/test/fuzztest/dialogsessionmanager_fuzzer/BUILD.gn index 0afe6c8753..639e17f9b9 100644 --- a/test/fuzztest/dialogsessionmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/dialogsessionmanager_fuzzer/BUILD.gn @@ -26,6 +26,7 @@ ohos_fuzztest("DialogSessionManagerFuzzTest") { "${ability_runtime_test_path}/fuzztest/dialogsessionmanager_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ @@ -36,7 +37,7 @@ ohos_fuzztest("DialogSessionManagerFuzzTest") { ] sources = [ "${ability_runtime_path}/services/abilitymgr/src/dialog_session/dialog_session_manager.cpp", - "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp", "dialogsessionmanager_fuzzer.cpp", ] @@ -56,6 +57,7 @@ ohos_fuzztest("DialogSessionManagerFuzzTest") { "${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:app_util", "${ability_runtime_services_path}/common:perm_verification", "//third_party/jsoncpp:jsoncpp", "//third_party/libjpeg-turbo:turbojpeg_static", diff --git a/test/fuzztest/disposedobserver_fuzzer/BUILD.gn b/test/fuzztest/disposedobserver_fuzzer/BUILD.gn index c52de3567b..c01c9bd4c4 100644 --- a/test/fuzztest/disposedobserver_fuzzer/BUILD.gn +++ b/test/fuzztest/disposedobserver_fuzzer/BUILD.gn @@ -26,6 +26,7 @@ ohos_fuzztest("DisposedObserverFuzzTest") { "${ability_runtime_test_path}/fuzztest/disposedobserver_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/extensionconfig_fuzzer/BUILD.gn b/test/fuzztest/extensionconfig_fuzzer/BUILD.gn index 04b2d733f6..fedd355222 100644 --- a/test/fuzztest/extensionconfig_fuzzer/BUILD.gn +++ b/test/fuzztest/extensionconfig_fuzzer/BUILD.gn @@ -26,6 +26,7 @@ ohos_fuzztest("ExtensionConfigFuzzTest") { "${ability_runtime_test_path}/fuzztest/extensionconfig_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/extensioncontrolinterceptor_fuzzer/BUILD.gn b/test/fuzztest/extensioncontrolinterceptor_fuzzer/BUILD.gn index c8a76b11aa..f3bbd8dbc2 100644 --- a/test/fuzztest/extensioncontrolinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/extensioncontrolinterceptor_fuzzer/BUILD.gn @@ -40,7 +40,7 @@ ohos_fuzztest("ExtensionControlInterceptorFuzzTest") { ] sources = [ "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp", - "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp", "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp", "extension_control_interceptor_fuzzer.cpp", ] diff --git a/test/fuzztest/extensionpermissionsutil_fuzzer/BUILD.gn b/test/fuzztest/extensionpermissionsutil_fuzzer/BUILD.gn index 0a4074974b..28c3a4f1a3 100755 --- a/test/fuzztest/extensionpermissionsutil_fuzzer/BUILD.gn +++ b/test/fuzztest/extensionpermissionsutil_fuzzer/BUILD.gn @@ -26,6 +26,7 @@ ohos_fuzztest("ExtensionPermissionsUtilFuzzTest") { "${ability_runtime_test_path}/fuzztest/extensionpermissionsutil_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "mock/include", ] diff --git a/test/fuzztest/extensionrecordfactory_fuzzer/BUILD.gn b/test/fuzztest/extensionrecordfactory_fuzzer/BUILD.gn index 9ebb025038..288ac5cd55 100644 --- a/test/fuzztest/extensionrecordfactory_fuzzer/BUILD.gn +++ b/test/fuzztest/extensionrecordfactory_fuzzer/BUILD.gn @@ -26,6 +26,7 @@ ohos_fuzztest("ExtensionRecordFactoryFuzzTest") { "${ability_runtime_test_path}/fuzztest/extensionrecordfactory_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/extensionrecordmanager_fuzzer/BUILD.gn b/test/fuzztest/extensionrecordmanager_fuzzer/BUILD.gn index 567f27db7d..7d94de9186 100644 --- a/test/fuzztest/extensionrecordmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/extensionrecordmanager_fuzzer/BUILD.gn @@ -26,6 +26,7 @@ ohos_fuzztest("ExtensionRecordManagerFuzzTest") { "${ability_runtime_test_path}/fuzztest/extensionrecordmanager_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/fuzztest/freezeutil_fuzzer/BUILD.gn b/test/fuzztest/freezeutil_fuzzer/BUILD.gn index 535eae77db..5e40f7db00 100644 --- a/test/fuzztest/freezeutil_fuzzer/BUILD.gn +++ b/test/fuzztest/freezeutil_fuzzer/BUILD.gn @@ -30,6 +30,7 @@ ohos_fuzztest("FreezeUtilFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ @@ -40,7 +41,7 @@ ohos_fuzztest("FreezeUtilFuzzTest") { ] sources = [ "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp", - "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp", "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp", "freezeutil_fuzzer.cpp", ] diff --git a/test/fuzztest/openlinkoptions_fuzzer/BUILD.gn b/test/fuzztest/openlinkoptions_fuzzer/BUILD.gn index b9800e88ea..588260ac38 100644 --- a/test/fuzztest/openlinkoptions_fuzzer/BUILD.gn +++ b/test/fuzztest/openlinkoptions_fuzzer/BUILD.gn @@ -31,6 +31,7 @@ ohos_fuzztest("OpenLinkOptionsFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ @@ -41,7 +42,7 @@ ohos_fuzztest("OpenLinkOptionsFuzzTest") { ] sources = [ "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp", - "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp", "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp", "openlinkoptions_fuzzer.cpp", ] diff --git a/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn b/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn index bf26503f2c..956b3ba888 100644 --- a/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn @@ -31,6 +31,7 @@ ohos_fuzztest("ScreenUnlockInterceptorFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/abilitymgr/include/interceptor", "${ability_runtime_utils_path}/server/startup/include", @@ -46,7 +47,7 @@ ohos_fuzztest("ScreenUnlockInterceptorFuzzTest") { "${ability_runtime_path}/frameworks/native/appkit/ability_bundle_manager_helper/bundle_mgr_helper.cpp", "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp", "${ability_runtime_services_path}/abilitymgr/src/interceptor/screen_unlock_interceptor.cpp", - "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp", "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp", "screenunlockinterceptor_fuzzer.cpp", ] @@ -60,6 +61,7 @@ ohos_fuzztest("ScreenUnlockInterceptorFuzzTest") { "${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:app_util", "${ability_runtime_services_path}/common:perm_verification", "//third_party/jsoncpp:jsoncpp", "//third_party/libjpeg-turbo:turbojpeg_static", diff --git a/test/fuzztest/startabilityutils_fuzzer/BUILD.gn b/test/fuzztest/startabilityutils_fuzzer/BUILD.gn index 23b8895700..b24ce65696 100755 --- a/test/fuzztest/startabilityutils_fuzzer/BUILD.gn +++ b/test/fuzztest/startabilityutils_fuzzer/BUILD.gn @@ -37,7 +37,7 @@ ohos_fuzztest("StartAbilityUtilsFuzzTest") { ] sources = [ - "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp", "startabilityutils_fuzzer.cpp", ] diff --git a/test/fuzztest/startotherappinterceptor_fuzzer/BUILD.gn b/test/fuzztest/startotherappinterceptor_fuzzer/BUILD.gn index e44a6ee22f..cbe1104a46 100644 --- a/test/fuzztest/startotherappinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/startotherappinterceptor_fuzzer/BUILD.gn @@ -31,6 +31,7 @@ ohos_fuzztest("StartOtherappinterceptorFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/abilitymgr/include/interceptor", "${ability_runtime_utils_path}/server/startup/include", @@ -45,7 +46,7 @@ ohos_fuzztest("StartOtherappinterceptorFuzzTest") { sources = [ "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp", "${ability_runtime_services_path}/abilitymgr/src/interceptor/start_other_app_interceptor.cpp", - "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp", "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp", "startotherappinterceptor_fuzzer.cpp", ] @@ -56,6 +57,7 @@ ohos_fuzztest("StartOtherappinterceptorFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${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}/appmgr:libappms", diff --git a/test/fuzztest/statusbardelegatemanager_fuzzer/BUILD.gn b/test/fuzztest/statusbardelegatemanager_fuzzer/BUILD.gn index 7384ad21ba..4f5f81f5e9 100644 --- a/test/fuzztest/statusbardelegatemanager_fuzzer/BUILD.gn +++ b/test/fuzztest/statusbardelegatemanager_fuzzer/BUILD.gn @@ -31,6 +31,7 @@ ohos_fuzztest("StatusBarDelegateManagerFuzzTest") { "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ @@ -43,8 +44,8 @@ ohos_fuzztest("StatusBarDelegateManagerFuzzTest") { "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp", "${ability_runtime_services_path}/abilitymgr/src/process_options.cpp", "${ability_runtime_services_path}/abilitymgr/src/scene_board/status_bar_delegate_manager.cpp", - "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", "${ability_runtime_services_path}/abilitymgr/src/start_window_option.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp", "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp", "statusbardelegatemanager_fuzzer.cpp", ] diff --git a/test/fuzztest/uiextensionrecordfactory_fuzzer/BUILD.gn b/test/fuzztest/uiextensionrecordfactory_fuzzer/BUILD.gn index 53be0ece6d..9a593f9bba 100644 --- a/test/fuzztest/uiextensionrecordfactory_fuzzer/BUILD.gn +++ b/test/fuzztest/uiextensionrecordfactory_fuzzer/BUILD.gn @@ -26,6 +26,7 @@ ohos_fuzztest("UIExtensionRecordFactoryFuzzTest") { "${ability_runtime_test_path}/fuzztest/uiextensionrecordfactory_fuzzer" include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] cflags = [ diff --git a/test/mock/services_abilitymgr_test/appmgr_test_service/BUILD.gn b/test/mock/services_abilitymgr_test/appmgr_test_service/BUILD.gn index 4a6f1f1652..5c1c9fd143 100644 --- a/test/mock/services_abilitymgr_test/appmgr_test_service/BUILD.gn +++ b/test/mock/services_abilitymgr_test/appmgr_test_service/BUILD.gn @@ -17,6 +17,7 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni") config("appmgr_test_service_config") { include_dirs = [ "${ability_runtime_test_path}/mock/services_abilitymgr_test/appmgr_test_service/include/", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_innerkits_path}/ability_manager/include", "${ability_runtime_innerkits_path}/app_manager/include", diff --git a/test/mock/services_abilitymgr_test/libs/aakit/BUILD.gn b/test/mock/services_abilitymgr_test/libs/aakit/BUILD.gn index d78450dec0..dfcde5d84a 100644 --- a/test/mock/services_abilitymgr_test/libs/aakit/BUILD.gn +++ b/test/mock/services_abilitymgr_test/libs/aakit/BUILD.gn @@ -18,6 +18,7 @@ config("aakit_mock_config") { include_dirs = [ "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit/include", "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_innerkits_path}/app_manager/include", "${ability_runtime_path}/interfaces/kits/native/ability/native/", diff --git a/test/mock/services_abilitymgr_test/libs/appexecfwk_core/BUILD.gn b/test/mock/services_abilitymgr_test/libs/appexecfwk_core/BUILD.gn index 9b37ed7a51..42dcd58d6b 100644 --- a/test/mock/services_abilitymgr_test/libs/appexecfwk_core/BUILD.gn +++ b/test/mock/services_abilitymgr_test/libs/appexecfwk_core/BUILD.gn @@ -20,6 +20,7 @@ config("appexecfwk_core_mock_config") { "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core/include/appmgr", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core/include/bundlemgr", "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", "${ability_runtime_path}/interfaces/kits/native/ability/native/", diff --git a/test/moduletest/ability_delegator_test/BUILD.gn b/test/moduletest/ability_delegator_test/BUILD.gn index 67486ee471..4ec7c3dd69 100644 --- a/test/moduletest/ability_delegator_test/BUILD.gn +++ b/test/moduletest/ability_delegator_test/BUILD.gn @@ -35,6 +35,7 @@ config("moduletest_include_dir") { "${ability_runtime_path}/interfaces/kits/native/appkit/ability_delegator/runner_runtime/", "${ability_runtime_innerkits_path}/ability_manager/include", "//third_party/googletest/googlemock/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context/", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app/", diff --git a/test/moduletest/ability_test/BUILD.gn b/test/moduletest/ability_test/BUILD.gn index 793477a846..9d01fedc68 100644 --- a/test/moduletest/ability_test/BUILD.gn +++ b/test/moduletest/ability_test/BUILD.gn @@ -32,6 +32,7 @@ config("module_private_config") { "${ability_runtime_services_path}/common/include", "${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include", "${ability_runtime_test_path}/mock/frameworks_kits_test/DemoAbility", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "//third_party/jsoncpp/include", "${ability_runtime_innerkits_path}/dataobs_manager/include", diff --git a/test/moduletest/ability_timeout_module_test/BUILD.gn b/test/moduletest/ability_timeout_module_test/BUILD.gn index 13008ecada..f7f53a9551 100644 --- a/test/moduletest/ability_timeout_module_test/BUILD.gn +++ b/test/moduletest/ability_timeout_module_test/BUILD.gn @@ -30,7 +30,6 @@ ohos_moduletest("ability_timeout_module_test") { sources = [ "ability_timeout_module_test.cpp" ] sources += [ "${ability_runtime_services_path}/abilitymgr/src/ability_bundle_event_callback.cpp", - "${ability_runtime_services_path}/abilitymgr/src/ability_event_util.cpp", "${ability_runtime_services_path}/abilitymgr/src/ability_manager_service.cpp", "${ability_runtime_services_path}/abilitymgr/src/app_exit_reason_data_manager.cpp", "${ability_runtime_services_path}/abilitymgr/src/assert_fault_callback_death_mgr.cpp", @@ -39,6 +38,7 @@ ohos_moduletest("ability_timeout_module_test") { "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler.cpp", "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler/start_ability_sandbox_savefile.cpp", "${ability_runtime_services_path}/abilitymgr/src/sub_managers_helper.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp", "${ability_runtime_services_path}/abilitymgr/src/window_focus_changed_listener.cpp", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/sa_mgr/src/sa_mgr_client_mock.cpp", "${ability_runtime_test_path}/moduletest/mock/src/mock_app_mgr_client.cpp", diff --git a/test/moduletest/running_infos_module_test/BUILD.gn b/test/moduletest/running_infos_module_test/BUILD.gn index cd4eae6cbe..bcdcbb538f 100644 --- a/test/moduletest/running_infos_module_test/BUILD.gn +++ b/test/moduletest/running_infos_module_test/BUILD.gn @@ -31,7 +31,6 @@ ohos_moduletest("running_infos_module_test") { sources = [ "running_infos_module_test.cpp" ] sources += [ "${ability_runtime_services_path}/abilitymgr/src/ability_bundle_event_callback.cpp", - "${ability_runtime_services_path}/abilitymgr/src/ability_event_util.cpp", "${ability_runtime_services_path}/abilitymgr/src/ability_manager_service.cpp", "${ability_runtime_services_path}/abilitymgr/src/app_exit_reason_data_manager.cpp", "${ability_runtime_services_path}/abilitymgr/src/assert_fault_callback_death_mgr.cpp", @@ -40,6 +39,7 @@ ohos_moduletest("running_infos_module_test") { "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler.cpp", "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler/start_ability_sandbox_savefile.cpp", "${ability_runtime_services_path}/abilitymgr/src/sub_managers_helper.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp", "${ability_runtime_services_path}/abilitymgr/src/window_focus_changed_listener.cpp", "${ability_runtime_test_path}/mock/common/src/mock_native_token.cpp", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/sa_mgr/src/sa_mgr_client_mock.cpp", diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index ea0ccb4ca5..7aad827465 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -114,7 +114,6 @@ ohos_source_set("abilityms_test_source") { "${ability_runtime_services_path}/abilitymgr/src/ability_connect_manager.cpp", "${ability_runtime_services_path}/abilitymgr/src/ability_debug_deal.cpp", "${ability_runtime_services_path}/abilitymgr/src/ability_event_handler.cpp", - "${ability_runtime_services_path}/abilitymgr/src/ability_event_util.cpp", "${ability_runtime_services_path}/abilitymgr/src/ability_manager_collaborator_proxy.cpp", "${ability_runtime_services_path}/abilitymgr/src/ability_manager_proxy.cpp", "${ability_runtime_services_path}/abilitymgr/src/ability_manager_service.cpp", @@ -153,7 +152,6 @@ ohos_source_set("abilityms_test_source") { "${ability_runtime_services_path}/abilitymgr/src/free_install_manager.cpp", "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_manager.cpp", "${ability_runtime_services_path}/abilitymgr/src/insight_intent_profile.cpp", - "${ability_runtime_services_path}/abilitymgr/src/insight_intent_utils.cpp", "${ability_runtime_services_path}/abilitymgr/src/interceptor/ability_interceptor_executer.cpp", "${ability_runtime_services_path}/abilitymgr/src/interceptor/ability_jump_interceptor.cpp", "${ability_runtime_services_path}/abilitymgr/src/interceptor/control_interceptor.cpp", @@ -173,7 +171,6 @@ ohos_source_set("abilityms_test_source") { "${ability_runtime_services_path}/abilitymgr/src/sender_info.cpp", "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler.cpp", "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler/start_ability_sandbox_savefile.cpp", - "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", "${ability_runtime_services_path}/abilitymgr/src/sub_managers_helper.cpp", "${ability_runtime_services_path}/abilitymgr/src/task_data_persistence_mgr.cpp", "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record.cpp", @@ -181,6 +178,9 @@ ohos_source_set("abilityms_test_source") { "${ability_runtime_services_path}/abilitymgr/src/uri_utils.cpp", "${ability_runtime_services_path}/abilitymgr/src/user_controller.cpp", "${ability_runtime_services_path}/abilitymgr/src/user_event_handler.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/insight_intent_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp", "${ability_runtime_services_path}/abilitymgr/src/want_receiver_proxy.cpp", "${ability_runtime_services_path}/abilitymgr/src/want_receiver_stub.cpp", "${ability_runtime_services_path}/abilitymgr/src/want_sender_info.cpp", diff --git a/test/unittest/ability_bundle_event_callback_test/BUILD.gn b/test/unittest/ability_bundle_event_callback_test/BUILD.gn index 1c7807e85e..31997de481 100644 --- a/test/unittest/ability_bundle_event_callback_test/BUILD.gn +++ b/test/unittest/ability_bundle_event_callback_test/BUILD.gn @@ -30,7 +30,7 @@ ohos_unittest("ability_bundle_event_callback_test") { sources = [ "${ability_runtime_path}/services/abilitymgr/src/ability_auto_startup_data_manager.cpp", "${ability_runtime_path}/services/abilitymgr/src/ability_auto_startup_service.cpp", - "${ability_runtime_path}/services/abilitymgr/src/ability_event_util.cpp", + "${ability_runtime_path}/services/abilitymgr/src/utils/ability_event_util.cpp", "${ability_runtime_services_path}/abilitymgr/src/ability_bundle_event_callback.cpp", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "ability_bundle_event_callback_test.cpp", diff --git a/test/unittest/ability_debug_deal_test/BUILD.gn b/test/unittest/ability_debug_deal_test/BUILD.gn index 9bea88d6ba..e656703057 100644 --- a/test/unittest/ability_debug_deal_test/BUILD.gn +++ b/test/unittest/ability_debug_deal_test/BUILD.gn @@ -23,6 +23,7 @@ ohos_unittest("ability_debug_deal_test") { "${ability_runtime_path}/test/mock/services_appmgr_test/include", "${ability_runtime_path}/interfaces/inner_api/include", "${ability_runtime_path}/frameworks/native/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] diff --git a/test/unittest/ability_debug_response_stub_test/BUILD.gn b/test/unittest/ability_debug_response_stub_test/BUILD.gn index 73b2c81f32..b12b07d4d3 100644 --- a/test/unittest/ability_debug_response_stub_test/BUILD.gn +++ b/test/unittest/ability_debug_response_stub_test/BUILD.gn @@ -23,6 +23,7 @@ ohos_unittest("ability_debug_response_stub_test") { "${ability_runtime_path}/test/mock/services_appmgr_test/include", "${ability_runtime_path}/interfaces/inner_api/include", "${ability_runtime_path}/frameworks/native/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/appmgr/include", ] diff --git a/test/unittest/ability_first_frame_state_observer_manager_test/BUILD.gn b/test/unittest/ability_first_frame_state_observer_manager_test/BUILD.gn index 23ce650def..914cf3963e 100644 --- a/test/unittest/ability_first_frame_state_observer_manager_test/BUILD.gn +++ b/test/unittest/ability_first_frame_state_observer_manager_test/BUILD.gn @@ -21,6 +21,7 @@ ohos_unittest("ability_first_frame_state_observer_manager_test") { module_out_path = module_output_path include_dirs = [ + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "mock/include", diff --git a/test/unittest/ability_interceptor_second_test/BUILD.gn b/test/unittest/ability_interceptor_second_test/BUILD.gn index 384759c20b..d080ed417d 100644 --- a/test/unittest/ability_interceptor_second_test/BUILD.gn +++ b/test/unittest/ability_interceptor_second_test/BUILD.gn @@ -26,12 +26,13 @@ ohos_unittest("ability_interceptor_second_test") { "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", "${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] sources = [ # add mock file - "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "ability_interceptor_second_test.cpp", ] diff --git a/test/unittest/ability_interceptor_test/BUILD.gn b/test/unittest/ability_interceptor_test/BUILD.gn index 1e67775e19..7c585b45a7 100644 --- a/test/unittest/ability_interceptor_test/BUILD.gn +++ b/test/unittest/ability_interceptor_test/BUILD.gn @@ -26,12 +26,13 @@ ohos_unittest("ability_interceptor_test") { "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", "${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] sources = [ # add mock file - "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", "ability_interceptor_test.cpp", ] diff --git a/test/unittest/ability_interceptor_third_test/BUILD.gn b/test/unittest/ability_interceptor_third_test/BUILD.gn index aa0393101c..104ae6b747 100644 --- a/test/unittest/ability_interceptor_third_test/BUILD.gn +++ b/test/unittest/ability_interceptor_third_test/BUILD.gn @@ -26,6 +26,7 @@ ohos_unittest("ability_interceptor_third_test") { "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", "${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/abilitymgr/include/interceptor", ] @@ -33,7 +34,7 @@ ohos_unittest("ability_interceptor_third_test") { sources = [ # add mock file "${ability_runtime_services_path}/abilitymgr/src/interceptor/ability_interceptor_executer.cpp", - "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp", "ability_interceptor_third_test.cpp", ] diff --git a/test/unittest/ability_manager_collaborator_proxy_test/BUILD.gn b/test/unittest/ability_manager_collaborator_proxy_test/BUILD.gn index 8787c77786..d030028d67 100644 --- a/test/unittest/ability_manager_collaborator_proxy_test/BUILD.gn +++ b/test/unittest/ability_manager_collaborator_proxy_test/BUILD.gn @@ -21,6 +21,7 @@ ohos_unittest("ability_manager_collaborator_proxy_test") { include_dirs = [ "${ability_runtime_path}/interfaces/inner_api/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_test_path}/unittest/ability_manager_proxy_test/", ] diff --git a/test/unittest/ability_manager_service_fourth_test/BUILD.gn b/test/unittest/ability_manager_service_fourth_test/BUILD.gn index 1989c621ab..40aa849b6e 100644 --- a/test/unittest/ability_manager_service_fourth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_fourth_test/BUILD.gn @@ -31,6 +31,7 @@ ohos_unittest("ability_manager_service_fourth_test") { "${ability_runtime_path}/interfaces/kits/native/ability/ability_runtime/", "${ability_runtime_path}/interfaces/inner_api/ability_manager/include", "${ability_runtime_path}/services/abilitymgr/include/interceptor/", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include", @@ -44,11 +45,11 @@ ohos_unittest("ability_manager_service_fourth_test") { "${ability_runtime_services_path}/abilitymgr/src/ability_auto_startup_service.cpp", "${ability_runtime_services_path}/abilitymgr/src/ability_bundle_event_callback.cpp", "${ability_runtime_services_path}/abilitymgr/src/ability_connect_callback_stub.cpp", - "${ability_runtime_services_path}/abilitymgr/src/ability_event_util.cpp", "${ability_runtime_services_path}/abilitymgr/src/auto_startup_info.cpp", "${ability_runtime_services_path}/abilitymgr/src/exit_reason.cpp", "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_manager.cpp", "${ability_runtime_services_path}/abilitymgr/src/modal_system_dialog/modal_system_dialog_ui_extension.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp", "${ability_runtime_services_path}/abilitymgr/src/utils/modal_system_dialog_util.cpp", "${ability_runtime_services_path}/common/src/ffrt_task_handler_wrap.cpp", "${ability_runtime_services_path}/common/src/queue_task_handler_wrap.cpp", diff --git a/test/unittest/ability_manager_service_third_test/BUILD.gn b/test/unittest/ability_manager_service_third_test/BUILD.gn index a60eab8cce..59d365bf34 100644 --- a/test/unittest/ability_manager_service_third_test/BUILD.gn +++ b/test/unittest/ability_manager_service_third_test/BUILD.gn @@ -29,6 +29,7 @@ ohos_unittest("ability_manager_service_third_test") { "${ability_runtime_innerkits_path}/uri_permission/include", "${ability_runtime_path}/interfaces/kits/native/ability/ability_runtime/", "${ability_runtime_path}/interfaces/inner_api/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${ability_runtime_test_path}/mock/mock_sa_call", @@ -42,9 +43,9 @@ ohos_unittest("ability_manager_service_third_test") { "${ability_runtime_services_path}/abilitymgr/src/ability_auto_startup_service.cpp", "${ability_runtime_services_path}/abilitymgr/src/ability_bundle_event_callback.cpp", "${ability_runtime_services_path}/abilitymgr/src/ability_connect_callback_stub.cpp", - "${ability_runtime_services_path}/abilitymgr/src/ability_event_util.cpp", "${ability_runtime_services_path}/abilitymgr/src/auto_startup_info.cpp", "${ability_runtime_services_path}/abilitymgr/src/deeplink_reserve/deeplink_reserve_config.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp", "${ability_runtime_services_path}/common/src/ffrt_task_handler_wrap.cpp", "${ability_runtime_services_path}/common/src/queue_task_handler_wrap.cpp", "${ability_runtime_services_path}/common/src/task_handler_wrap.cpp", diff --git a/test/unittest/ability_running_info_test/BUILD.gn b/test/unittest/ability_running_info_test/BUILD.gn index da40287ea4..8e8e9204db 100755 --- a/test/unittest/ability_running_info_test/BUILD.gn +++ b/test/unittest/ability_running_info_test/BUILD.gn @@ -21,6 +21,7 @@ ohos_unittest("ability_running_info_test") { include_dirs = [ "${bundlefwk_inner_api_path}/appexecfwk_base/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] diff --git a/test/unittest/ams_mgr_proxy_test/BUILD.gn b/test/unittest/ams_mgr_proxy_test/BUILD.gn index 9beef7fa1f..169e7eb4b9 100644 --- a/test/unittest/ams_mgr_proxy_test/BUILD.gn +++ b/test/unittest/ams_mgr_proxy_test/BUILD.gn @@ -22,6 +22,7 @@ ohos_unittest("AmsMgrProxyTest") { include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/appkit/ability_bundle_manager_helper", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/appmgr/include", "${ability_runtime_test_path}/mock/services_appmgr_test/include", diff --git a/test/unittest/ams_mgr_stub_test/BUILD.gn b/test/unittest/ams_mgr_stub_test/BUILD.gn index 2e12ee1185..3832163a54 100644 --- a/test/unittest/ams_mgr_stub_test/BUILD.gn +++ b/test/unittest/ams_mgr_stub_test/BUILD.gn @@ -21,6 +21,7 @@ ohos_unittest("AmsMgrStubTest") { include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/appkit/ability_bundle_manager_helper", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/appmgr/include", "${ability_runtime_test_path}/mock/services_appmgr_test/include", diff --git a/test/unittest/app_lifecycle_deal_test/BUILD.gn b/test/unittest/app_lifecycle_deal_test/BUILD.gn index ec79646507..518c1f302a 100644 --- a/test/unittest/app_lifecycle_deal_test/BUILD.gn +++ b/test/unittest/app_lifecycle_deal_test/BUILD.gn @@ -27,6 +27,7 @@ ohos_unittest("app_lifecycle_deal_test") { include_dirs = [ "${ability_runtime_test_path}/mock/common/include", "${ability_runtime_test_path}/mock/services_appmgr_test/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/appmgr/include", "${ability_runtime_services_path}/appmgr/test/unittest/mocks", diff --git a/test/unittest/app_mgr_client_first_test/BUILD.gn b/test/unittest/app_mgr_client_first_test/BUILD.gn index 76a1a792df..bb00a5e525 100644 --- a/test/unittest/app_mgr_client_first_test/BUILD.gn +++ b/test/unittest/app_mgr_client_first_test/BUILD.gn @@ -25,6 +25,7 @@ ohos_unittest("app_mgr_client_first_test") { ] include_dirs = [ + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/appmgr/test/unittest/mocks", "${ability_runtime_test_path}/mock/common/include", diff --git a/test/unittest/app_mgr_client_test/BUILD.gn b/test/unittest/app_mgr_client_test/BUILD.gn index 2a9e9f29d3..7c6f302cbd 100644 --- a/test/unittest/app_mgr_client_test/BUILD.gn +++ b/test/unittest/app_mgr_client_test/BUILD.gn @@ -25,6 +25,7 @@ ohos_unittest("AppMgrClientTest") { ] include_dirs = [ + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/appmgr/test/unittest/mocks", "${ability_runtime_test_path}/mock/common/include", diff --git a/test/unittest/app_mgr_service_inner_second_test/BUILD.gn b/test/unittest/app_mgr_service_inner_second_test/BUILD.gn index 7fc473f371..722adefaa5 100644 --- a/test/unittest/app_mgr_service_inner_second_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_second_test/BUILD.gn @@ -34,6 +34,7 @@ ohos_unittest("AppMgrServiceInnerSecondTest") { "${ability_runtime_test_path}/mock/services_appmgr_test/include", "${ability_runtime_test_path}/mock/task_handler_wrap_mock/include", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/appdfr/include", "${ability_runtime_test_path}/moduletest/mock/include", diff --git a/test/unittest/app_mgr_service_inner_tdd_test/BUILD.gn b/test/unittest/app_mgr_service_inner_tdd_test/BUILD.gn index e10028032d..43c5fdb441 100644 --- a/test/unittest/app_mgr_service_inner_tdd_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_tdd_test/BUILD.gn @@ -29,7 +29,9 @@ ohos_unittest("app_mgr_service_inner_tdd_test") { "${ability_runtime_test_path}/mock/common/include", "${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include", "${ability_runtime_test_path}/mock/services_appmgr_test/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_test_path}/moduletest/mock/include", ] diff --git a/test/unittest/app_mgr_service_inner_test/BUILD.gn b/test/unittest/app_mgr_service_inner_test/BUILD.gn index 3564df2380..b4a8dbdd3a 100644 --- a/test/unittest/app_mgr_service_inner_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_test/BUILD.gn @@ -32,7 +32,9 @@ ohos_unittest("AppMgrServiceInnerTest") { "${ability_runtime_test_path}/mock/services_appmgr_test/include", "${ability_runtime_test_path}/mock/task_handler_wrap_mock/include", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_test_path}/moduletest/mock/include", ] diff --git a/test/unittest/app_scheduler_test/BUILD.gn b/test/unittest/app_scheduler_test/BUILD.gn index 55e4198a84..24a0ce99af 100644 --- a/test/unittest/app_scheduler_test/BUILD.gn +++ b/test/unittest/app_scheduler_test/BUILD.gn @@ -29,7 +29,9 @@ ohos_unittest("app_scheduler_test") { branch_protector_ret = "pac_ret" include_dirs = [ + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_test_path}/mock/mock_sa_call", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/system_ability_mock", "${ability_runtime_test_path}/unittest/app_debug_listener_proxy_test", 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 68a3526a5f..074659d0ca 100644 --- a/test/unittest/assert_fault_callback_death_mgr_test/BUILD.gn +++ b/test/unittest/assert_fault_callback_death_mgr_test/BUILD.gn @@ -26,7 +26,9 @@ ohos_unittest("assert_fault_callback_death_mgr_test") { branch_protector_ret = "pac_ret" include_dirs = [ + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_test_path}/unittest/app_debug_listener_proxy_test", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", ] diff --git a/test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_proxy_test/BUILD.gn b/test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_proxy_test/BUILD.gn index cf8e3cdcf2..5e4a54f2b2 100644 --- a/test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_proxy_test/BUILD.gn +++ b/test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_proxy_test/BUILD.gn @@ -36,7 +36,9 @@ config("ability_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/app", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", "${ability_runtime_innerkits_path}/uri/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app", "${ability_runtime_path}/interfaces/kits/native/appkit/app", "${form_fwk_path}/interfaces/kits/native/include", diff --git a/test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_test/BUILD.gn b/test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_test/BUILD.gn index c0034a507f..a92a370989 100644 --- a/test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_test/BUILD.gn +++ b/test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_test/BUILD.gn @@ -36,7 +36,9 @@ config("ability_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/app", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", "${ability_runtime_innerkits_path}/uri/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app", "${ability_runtime_path}/interfaces/kits/native/appkit/app", "${form_fwk_path}/interfaces/kits/native/include", diff --git a/test/unittest/dialog_session_manager_test/BUILD.gn b/test/unittest/dialog_session_manager_test/BUILD.gn index cc4fe5593a..d4c9ee4d60 100644 --- a/test/unittest/dialog_session_manager_test/BUILD.gn +++ b/test/unittest/dialog_session_manager_test/BUILD.gn @@ -36,7 +36,7 @@ ohos_unittest("dialog_session_manager_test") { "${ability_runtime_path}/frameworks/native/appkit/ability_bundle_manager_helper/bundle_mgr_helper.cpp", "${ability_runtime_path}/services/abilitymgr/src/dialog_session/dialog_session_info.cpp", "${ability_runtime_path}/services/abilitymgr/src/dialog_session/dialog_session_manager.cpp", - "${ability_runtime_path}/services/abilitymgr/src/start_ability_utils.cpp", + "${ability_runtime_path}/services/abilitymgr/src/utils/start_ability_utils.cpp", "dialog_session_manager_test.cpp", ] @@ -49,6 +49,7 @@ ohos_unittest("dialog_session_manager_test") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", + "${ability_runtime_services_path}/common:app_util", "//third_party/googletest:gmock_main", ] diff --git a/test/unittest/dump_utils_test/BUILD.gn b/test/unittest/dump_utils_test/BUILD.gn index 58657e1215..043bf174fe 100644 --- a/test/unittest/dump_utils_test/BUILD.gn +++ b/test/unittest/dump_utils_test/BUILD.gn @@ -31,7 +31,6 @@ ohos_unittest("dump_utils_test") { "${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/common/include", "${ability_runtime_path}interfaces/inner_api/ability_manager/include", - "${ability_runtime_services_path}/abilitymgr/include", ] sources = [ diff --git a/test/unittest/extension_control_interceptor_test/BUILD.gn b/test/unittest/extension_control_interceptor_test/BUILD.gn index d09126a828..a70ce940aa 100644 --- a/test/unittest/extension_control_interceptor_test/BUILD.gn +++ b/test/unittest/extension_control_interceptor_test/BUILD.gn @@ -22,7 +22,7 @@ ohos_unittest("extension_control_interceptor_test") { module_out_path = module_output_path sources = [ "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp", - "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp", "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp", "extension_control_interceptor_test.cpp", ] diff --git a/test/unittest/extension_permissions_util_test/BUILD.gn b/test/unittest/extension_permissions_util_test/BUILD.gn index 40bd0468cc..cf4834c570 100644 --- a/test/unittest/extension_permissions_util_test/BUILD.gn +++ b/test/unittest/extension_permissions_util_test/BUILD.gn @@ -28,7 +28,9 @@ ohos_unittest("extension_permissions_util_test") { include_dirs = [ "mock/include", "${ability_runtime_services_path}/abilitymgr/include/utils", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_services_path}/common/include", ] diff --git a/test/unittest/fault_data/BUILD.gn b/test/unittest/fault_data/BUILD.gn index 80bca06fb1..78e652f86c 100644 --- a/test/unittest/fault_data/BUILD.gn +++ b/test/unittest/fault_data/BUILD.gn @@ -26,7 +26,9 @@ ohos_unittest("fault_data_test") { include_dirs = [ "${ability_runtime_test_path}/mock/common/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${ability_runtime_services_path}/appmgr/test/unittest/mocks", ] diff --git a/test/unittest/frameworks_kits_ability_native_test/BUILD.gn b/test/unittest/frameworks_kits_ability_native_test/BUILD.gn index 3c0234573b..df8754ee02 100644 --- a/test/unittest/frameworks_kits_ability_native_test/BUILD.gn +++ b/test/unittest/frameworks_kits_ability_native_test/BUILD.gn @@ -36,7 +36,9 @@ config("module_private_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/app/task", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit/include", "${ability_runtime_test_path}/mock/frameworks_kits_appkit_native_test/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_services_path}/common/include", "${distributeddatamgr_path}/distributeddatamgr/interfaces/innerkits/app_distributeddata/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -409,7 +411,9 @@ ohos_unittest("data_ability_helper_test") { } branch_protector_ret = "pac_ret" include_dirs = [ + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_path}/interfaces/kits/native/ability/native", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", ] @@ -464,7 +468,9 @@ ohos_unittest("data_ability_helper_test") { ohos_unittest("data_ability_helper_impl_test") { module_out_path = module_output_path include_dirs = [ + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_path}/interfaces/kits/native/ability/native", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", "${ability_runtime_path}/interfaces/kits/native/ability/native", @@ -1294,7 +1300,9 @@ ohos_unittest("data_ability_impl_test") { module_out_path = module_output_path include_dirs = [ + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_path}/interfaces/kits/native/ability/native", "${ability_base_kits_path}/extractortool/include", "${distributeddatamgr_path}/relational_store/frameworks/js/napi/rdb/include", diff --git a/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/BUILD.gn b/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/BUILD.gn index c1eaf7e802..9d8256ab57 100644 --- a/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/BUILD.gn +++ b/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/BUILD.gn @@ -36,7 +36,9 @@ config("unittest_include_dir") { "${ability_runtime_test_path}/mock/frameworks_kits_appkit_native_test/ability_delegator", "${ability_runtime_innerkits_path}/ability_manager/include", "//third_party/googletest/googlemock/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context/", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app/", "${ability_runtime_innerkits_path}/runtime/include/", diff --git a/test/unittest/implicit_start_processor_test/BUILD.gn b/test/unittest/implicit_start_processor_test/BUILD.gn index f7d279e8f8..0d34a050f4 100755 --- a/test/unittest/implicit_start_processor_test/BUILD.gn +++ b/test/unittest/implicit_start_processor_test/BUILD.gn @@ -29,7 +29,9 @@ ohos_unittest("implicit_start_processor_test") { include_dirs = [ "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/system_ability_mock", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_services_path}/abilitymgr/include/ecological_rule", ] 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 3fa7e3b927..970885ed96 100644 --- a/test/unittest/insight_intent/insight_intent_utils_test/BUILD.gn +++ b/test/unittest/insight_intent/insight_intent_utils_test/BUILD.gn @@ -25,7 +25,9 @@ ohos_unittest("insight_intent_utils_test") { } include_dirs = [ + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_test_path}/mock/common/include", "${ability_runtime_test_path}/mock/services_appmgr_test/include", ] @@ -34,7 +36,7 @@ ohos_unittest("insight_intent_utils_test") { "${ability_runtime_path}/frameworks/native/appkit/ability_bundle_manager_helper/bundle_mgr_helper.cpp", "${ability_runtime_path}/interfaces/inner_api/deps_wrapper/src/os_account_manager_wrapper.cpp", "${ability_runtime_services_path}/abilitymgr/src/insight_intent_profile.cpp", - "${ability_runtime_services_path}/abilitymgr/src/insight_intent_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp", "insight_intent_utils_test.cpp", ] diff --git a/test/unittest/js_photo_editor_extension_context_test/BUILD.gn b/test/unittest/js_photo_editor_extension_context_test/BUILD.gn index 7011d583ef..63251541a7 100644 --- a/test/unittest/js_photo_editor_extension_context_test/BUILD.gn +++ b/test/unittest/js_photo_editor_extension_context_test/BUILD.gn @@ -27,7 +27,9 @@ config("module_private_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/app/task", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit/include", "${ability_runtime_test_path}/mock/frameworks_kits_appkit_native_test/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_services_path}/common/include", "${distributeddatamgr_path}/distributeddatamgr/interfaces/innerkits/app_distributeddata/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", diff --git a/test/unittest/js_photo_editor_extension_impl_test/BUILD.gn b/test/unittest/js_photo_editor_extension_impl_test/BUILD.gn index e86b571fb5..98c72820db 100644 --- a/test/unittest/js_photo_editor_extension_impl_test/BUILD.gn +++ b/test/unittest/js_photo_editor_extension_impl_test/BUILD.gn @@ -27,7 +27,9 @@ config("module_private_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/app/task", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit/include", "${ability_runtime_test_path}/mock/frameworks_kits_appkit_native_test/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_services_path}/common/include", "${distributeddatamgr_path}/distributeddatamgr/interfaces/innerkits/app_distributeddata/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", diff --git a/test/unittest/main_element_utils_test/BUILD.gn b/test/unittest/main_element_utils_test/BUILD.gn index d89f7ce412..5db542a198 100755 --- a/test/unittest/main_element_utils_test/BUILD.gn +++ b/test/unittest/main_element_utils_test/BUILD.gn @@ -22,6 +22,7 @@ ohos_unittest("main_element_utils_test") { include_dirs = [ "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/system_ability_mock", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] diff --git a/test/unittest/multi_app_utils_test/BUILD.gn b/test/unittest/multi_app_utils_test/BUILD.gn index dae59ec054..56a9b7f65a 100644 --- a/test/unittest/multi_app_utils_test/BUILD.gn +++ b/test/unittest/multi_app_utils_test/BUILD.gn @@ -28,7 +28,9 @@ ohos_unittest("multi_app_utils_test") { include_dirs = [ "include", "${ability_runtime_services_path}/abilitymgr/include/utils", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_services_path}/appmgr/include", "${ability_runtime_services_path}/common/include", "${ability_runtime_test_path}/mock/services_appmgr_test/include", diff --git a/test/unittest/os_account_manager_wrapper_test/BUILD.gn b/test/unittest/os_account_manager_wrapper_test/BUILD.gn index 0e2b3e6838..531a1d6ba3 100644 --- a/test/unittest/os_account_manager_wrapper_test/BUILD.gn +++ b/test/unittest/os_account_manager_wrapper_test/BUILD.gn @@ -20,7 +20,9 @@ ohos_unittest("os_account_manager_wrapper_test") { module_out_path = module_output_path include_dirs = [ + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_innerkits_path}/deps_wrapper/include", ] diff --git a/test/unittest/pending_want_test/BUILD.gn b/test/unittest/pending_want_test/BUILD.gn index 5ab1b3c00e..2ce63378b3 100644 --- a/test/unittest/pending_want_test/BUILD.gn +++ b/test/unittest/pending_want_test/BUILD.gn @@ -22,7 +22,9 @@ ohos_unittest("pending_want_test") { include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context/", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_test_path}/mock/remote_native_token_mock/", ] diff --git a/test/unittest/photo_editor_extension_a_test/BUILD.gn b/test/unittest/photo_editor_extension_a_test/BUILD.gn index 552e1ec208..e52273d65f 100644 --- a/test/unittest/photo_editor_extension_a_test/BUILD.gn +++ b/test/unittest/photo_editor_extension_a_test/BUILD.gn @@ -27,7 +27,9 @@ config("module_private_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/app/task", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit/include", "${ability_runtime_test_path}/mock/frameworks_kits_appkit_native_test/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_services_path}/common/include", "${distributeddatamgr_path}/distributeddatamgr/interfaces/innerkits/app_distributeddata/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", diff --git a/test/unittest/photo_editor_extension_test/BUILD.gn b/test/unittest/photo_editor_extension_test/BUILD.gn index 77b97394cb..609c70af74 100644 --- a/test/unittest/photo_editor_extension_test/BUILD.gn +++ b/test/unittest/photo_editor_extension_test/BUILD.gn @@ -27,7 +27,9 @@ config("module_private_config") { "${ability_runtime_path}/interfaces/kits/native/appkit/app/task", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit/include", "${ability_runtime_test_path}/mock/frameworks_kits_appkit_native_test/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_services_path}/common/include", "${distributeddatamgr_path}/distributeddatamgr/interfaces/innerkits/app_distributeddata/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", diff --git a/test/unittest/preload_uiext_state_observer_test/BUILD.gn b/test/unittest/preload_uiext_state_observer_test/BUILD.gn index 3f43666157..99107079b4 100644 --- a/test/unittest/preload_uiext_state_observer_test/BUILD.gn +++ b/test/unittest/preload_uiext_state_observer_test/BUILD.gn @@ -29,6 +29,7 @@ ohos_unittest("preload_uiext_state_observer_test") { include_dirs = [ "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/system_ability_mock", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] diff --git a/test/unittest/resident_process_manager_test/BUILD.gn b/test/unittest/resident_process_manager_test/BUILD.gn index f9f972873d..77c90f2977 100755 --- a/test/unittest/resident_process_manager_test/BUILD.gn +++ b/test/unittest/resident_process_manager_test/BUILD.gn @@ -24,6 +24,7 @@ ohos_unittest("resident_process_manager_test") { include_dirs = [ "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/system_ability_mock", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] diff --git a/test/unittest/start_other_app_interceptor_test/BUILD.gn b/test/unittest/start_other_app_interceptor_test/BUILD.gn index 8be786b7be..b278e7b972 100644 --- a/test/unittest/start_other_app_interceptor_test/BUILD.gn +++ b/test/unittest/start_other_app_interceptor_test/BUILD.gn @@ -21,7 +21,9 @@ ohos_unittest("start_other_app_interceptor_test") { cflags_cc = [] include_dirs = [ + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_services_path}/appmgr/include", ] diff --git a/test/unittest/unlock_screen_test/BUILD.gn b/test/unittest/unlock_screen_test/BUILD.gn index 5d89c54ba6..f603c110ad 100644 --- a/test/unittest/unlock_screen_test/BUILD.gn +++ b/test/unittest/unlock_screen_test/BUILD.gn @@ -21,7 +21,9 @@ ohos_unittest("unlock_screen_test") { include_dirs = [ "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/system_ability_mock", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_services_path}/abilitymgr/include/screen_lock", ] diff --git a/test/unittest/want_agent_helper_test/BUILD.gn b/test/unittest/want_agent_helper_test/BUILD.gn index cab2bb1b74..8891a857f7 100644 --- a/test/unittest/want_agent_helper_test/BUILD.gn +++ b/test/unittest/want_agent_helper_test/BUILD.gn @@ -22,7 +22,9 @@ ohos_unittest("want_agent_helper_test") { include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context/", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_test_path}/mock/remote_native_token_mock/", ] diff --git a/test/unittest/want_utils_test/BUILD.gn b/test/unittest/want_utils_test/BUILD.gn index db274ea713..ce36dbe7b2 100644 --- a/test/unittest/want_utils_test/BUILD.gn +++ b/test/unittest/want_utils_test/BUILD.gn @@ -28,7 +28,9 @@ ohos_unittest("want_utils_test") { include_dirs = [ "include", "${ability_runtime_services_path}/abilitymgr/include/utils", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_services_path}/common/include", ] diff --git a/test/unittest/window_config_test/BUILD.gn b/test/unittest/window_config_test/BUILD.gn index 5b2da59cc1..92719f0b22 100644 --- a/test/unittest/window_config_test/BUILD.gn +++ b/test/unittest/window_config_test/BUILD.gn @@ -29,6 +29,7 @@ ohos_unittest("window_config_test") { include_dirs = [ "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/system_ability_mock", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] diff --git a/test/unittest/window_options_utils_test/BUILD.gn b/test/unittest/window_options_utils_test/BUILD.gn index 9664b72ab0..c514b95d8f 100644 --- a/test/unittest/window_options_utils_test/BUILD.gn +++ b/test/unittest/window_options_utils_test/BUILD.gn @@ -28,9 +28,12 @@ ohos_unittest("window_options_utils_test") { include_dirs = [ "mock/include", "${ability_runtime_services_path}/abilitymgr/include/utils", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_services_path}/common/include", "${ability_runtime_path}interfaces/inner_api/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] diff --git a/tools/aa/BUILD.gn b/tools/aa/BUILD.gn index 387c550b6e..3d6bf5b8bc 100644 --- a/tools/aa/BUILD.gn +++ b/tools/aa/BUILD.gn @@ -18,6 +18,7 @@ config("ability_command_config") { include_dirs = [ "include", "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", ] }