From 43a005195a737fb581375a47bd7551d6754d38df Mon Sep 17 00:00:00 2001 From: zhangzezhong Date: Fri, 27 Jun 2025 17:42:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3pulic=5Fdeps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzezhong --- frameworks/native/ability/native/BUILD.gn | 31 ++++++- frameworks/native/appkit/BUILD.gn | 1 + interfaces/inner_api/ability_manager/BUILD.gn | 1 + .../inner_api/extension_manager/BUILD.gn | 7 +- services/abilitymgr/BUILD.gn | 1 + .../BUILD.gn | 2 + .../abilityconnectionstub_fuzzer/BUILD.gn | 1 + .../BUILD.gn | 1 + test/fuzztest/appmgrrest_fuzzer/BUILD.gn | 2 + .../BUILD.gn | 1 + test/fuzztest/connectability_fuzzer/BUILD.gn | 2 + .../BUILD.gn | 1 + .../BUILD.gn | 2 + .../fuzztest/terminateability_fuzzer/BUILD.gn | 2 + .../ability_caller_fw_module_test/BUILD.gn | 5 + test/moduletest/ability_test/BUILD.gn | 18 ++++ .../ipc_ability_connect_test/BUILD.gn | 3 + .../native/demo_ui_extension_ability/BUILD.gn | 3 + .../BUILD.gn | 3 + .../BUILD.gn | 3 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../ability_connect_manager_test/BUILD.gn | 1 + .../unittest/ability_connection_test/BUILD.gn | 5 +- .../ability_extension_base_test/BUILD.gn | 3 + .../ability_extension_context_test/BUILD.gn | 2 + .../BUILD.gn | 1 + test/unittest/ability_extension_test/BUILD.gn | 4 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../ability_manager_proxy_test/BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../ability_manager_stub_second_test/BUILD.gn | 1 + .../ability_manager_stub_test/BUILD.gn | 1 + .../unittest/ability_record_mgr_test/BUILD.gn | 1 + .../ability_record_second_test/BUILD.gn | 1 + test/unittest/ability_record_test/BUILD.gn | 1 + .../ability_service_extension_test/BUILD.gn | 2 + test/unittest/app_recovery_test/BUILD.gn | 1 + .../BUILD.gn | 3 + .../app_service_extension_test/BUILD.gn | 2 + .../ohos_application_first_test/BUILD.gn | 2 + .../appkit/ohos_application_test/BUILD.gn | 3 + .../BUILD.gn | 1 + .../authorization_result_test/BUILD.gn | 1 + .../auto_fill_extension_context_test/BUILD.gn | 2 + test/unittest/call_record_test/BUILD.gn | 1 + .../BUILD.gn | 5 +- .../cj_ability_context_object_test/BUILD.gn | 1 + test/unittest/cj_ability_object_test/BUILD.gn | 1 + .../cj_ability_stage_object_test/BUILD.gn | 2 + test/unittest/cj_ability_stage_test/BUILD.gn | 2 + test/unittest/cj_ui_ability_test/BUILD.gn | 4 + test/unittest/configuration_test/BUILD.gn | 1 + test/unittest/connection_record_test/BUILD.gn | 1 + .../continuation_connector_test/BUILD.gn | 7 +- .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../extension_config_mgr_test/BUILD.gn | 6 +- .../extension_manager_client_test/BUILD.gn | 1 + .../BUILD.gn | 13 +++ .../BUILD.gn | 91 +++++++++++++++++++ .../BUILD.gn | 22 +++++ .../unittest/js_ability_context_test/BUILD.gn | 3 + .../js_app_service_extension_test/BUILD.gn | 3 + .../js_auto_fill_extension_test/BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../js_service_extension_test/BUILD.gn | 3 + test/unittest/js_ui_ability_test/BUILD.gn | 2 + .../BUILD.gn | 2 + .../js_ui_extension_context_test/BUILD.gn | 4 + .../BUILD.gn | 5 + .../BUILD.gn | 5 + .../js_ui_service_extension_test/BUILD.gn | 5 + .../js_ui_service_host_proxy_test/BUILD.gn | 1 + .../js_ui_service_proxy_test/BUILD.gn | 5 + .../mission_list_manager_ut_test/BUILD.gn | 3 + test/unittest/mission_list_test/BUILD.gn | 2 + .../native_child_process_test/BUILD.gn | 2 + .../photo_editor_extension_a_test/BUILD.gn | 1 + .../photo_editor_extension_test/BUILD.gn | 2 + .../service_extension_context_test/BUILD.gn | 3 + test/unittest/state_utils_test/BUILD.gn | 1 + .../timeout_state_utils_test/BUILD.gn | 2 + .../ui_extension_connect_test/BUILD.gn | 2 +- .../ui_extension_context_test/BUILD.gn | 2 + .../ui_service_extension_test/BUILD.gn | 3 + .../ui_service_host_proxy_test/BUILD.gn | 5 + test/unittest/ui_service_proxy_test/BUILD.gn | 5 + test/unittest/unlock_screen_test/BUILD.gn | 1 + 94 files changed, 364 insertions(+), 8 deletions(-) diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn index e68e098980d..28e2e45fee3 100644 --- a/frameworks/native/ability/native/BUILD.gn +++ b/frameworks/native/ability/native/BUILD.gn @@ -333,6 +333,7 @@ ohos_shared_library("abilitykit_native") { ] deps = [ + ":abilitykit_utils", ":configuration_helper", ":continuation_ipc", ":extension_blocklist_config", @@ -376,6 +377,7 @@ ohos_shared_library("abilitykit_native") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "graphic_2d:2d_graphics", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", @@ -496,6 +498,7 @@ ohos_shared_library("cj_abilitykit_native_ffi") { deps = [ ":abilitykit_native", ":continuation_ipc", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_path}/frameworks/cj/ffi/context:cj_context_ffi", @@ -503,6 +506,7 @@ ohos_shared_library("cj_abilitykit_native_ffi") { external_deps = [ "ace_engine:ace_uicontent", "eventhandler:libeventhandler", + "form_fwk:form_manager", "ipc:cj_ipc_ffi", "ipc:ipc_core", "ipc:ipc_napi", @@ -510,6 +514,7 @@ ohos_shared_library("cj_abilitykit_native_ffi") { "napi:ace_napi", "napi:cj_bind_ffi", "napi:cj_bind_native", + "window_manager:libwm", ] if (!(host_os == "linux" && host_cpu == "arm64")) { @@ -839,6 +844,7 @@ ohos_shared_library("uiabilitykit_native") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":configuration_helper", ":continuation_ipc", ":extensionkit_native", @@ -955,6 +961,7 @@ ohos_shared_library("ability_thread") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":extensionkit_native", ":uiabilitykit_native", "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", @@ -1025,6 +1032,7 @@ ohos_shared_library("form_extension") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":extensionkit_native", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_napi_path}/inner/napi_common:napi_common", @@ -1087,6 +1095,7 @@ ohos_shared_library("cj_form_extension") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":cj_extensionkit_native", ":extensionkit_native", ":form_extension", @@ -1189,6 +1198,7 @@ ohos_shared_library("service_extension") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":extensionkit_native", "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", @@ -1316,6 +1326,7 @@ ohos_shared_library("ui_service_extension") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":extensionkit_native", ":ui_service_extension_connection", "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", @@ -1414,7 +1425,10 @@ ohos_shared_library("ui_service_extension_module") { sources = [ "${ability_runtime_native_path}/ability/native/ui_service_extension_ability/ui_service_extension_module_loader.cpp" ] configs = [ ":ability_config" ] - deps = [ ":ui_service_extension" ] + deps = [ + ":ui_service_extension", + "${ability_runtime_innerkits_path}/runtime:runtime", + ] external_deps = [ "ability_base:configuration", @@ -1755,6 +1769,7 @@ ohos_shared_library("ui_extension") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":extensionkit_native", ":ui_service_extension_connection", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", @@ -1832,6 +1847,7 @@ ohos_shared_library("cj_ui_extension") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":cj_extensionkit_native", ":extensionkit_native", ":ui_extension", @@ -1942,6 +1958,7 @@ ohos_shared_library("share_extension") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":extensionkit_native", ":ui_extension", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", @@ -1991,6 +2008,7 @@ ohos_shared_library("cj_share_extension") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":cj_ui_extension", ":extensionkit_native", ":share_extension", @@ -2045,6 +2063,7 @@ ohos_shared_library("action_extension") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":extensionkit_native", ":ui_extension", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", @@ -2094,6 +2113,7 @@ ohos_shared_library("cj_action_extension") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":action_extension", ":cj_ui_extension", ":extensionkit_native", @@ -2312,6 +2332,7 @@ ohos_shared_library("embedded_ui_extension") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":extensionkit_native", ":ui_extension", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", @@ -2364,6 +2385,7 @@ ohos_shared_library("cj_embedded_ui_extension") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":cj_ui_extension", ":embedded_ui_extension", ":extensionkit_native", @@ -2460,6 +2482,7 @@ ohos_shared_library("auto_fill_extension") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":extensionkit_native", ":insight_intent_executor", ":ui_extension", @@ -2470,6 +2493,7 @@ ohos_shared_library("auto_fill_extension") { "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/appkit:app_context", + "${ability_runtime_path}/frameworks/native/ability/native:cj_form_extension", ] external_deps = [ @@ -2581,6 +2605,7 @@ ohos_shared_library("photo_editor_extension") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":extensionkit_native", ":ui_extension", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", @@ -2589,6 +2614,7 @@ ohos_shared_library("photo_editor_extension") { "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/appkit:app_context", + "${ability_runtime_path}/frameworks/native/ability/native:cj_form_extension", ] external_deps = [ @@ -2638,6 +2664,7 @@ ohos_shared_library("cj_photo_editor_extension") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":cj_extensionkit_native", ":cj_ui_extension", ":extensionkit_native", @@ -2650,6 +2677,7 @@ ohos_shared_library("cj_photo_editor_extension") { "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_path}/frameworks/cj/ffi:cj_ability_ffi", + "${ability_runtime_path}/frameworks/native/ability/native:cj_form_extension", ] external_deps = [ @@ -2748,6 +2776,7 @@ ohos_shared_library("app_service_extension") { deps = [ ":abilitykit_native", + ":abilitykit_utils", ":extensionkit_native", ":service_extension", "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", diff --git a/frameworks/native/appkit/BUILD.gn b/frameworks/native/appkit/BUILD.gn index ebb0dc003b6..e9e2d5e2892 100644 --- a/frameworks/native/appkit/BUILD.gn +++ b/frameworks/native/appkit/BUILD.gn @@ -165,6 +165,7 @@ ohos_shared_library("appkit_native") { "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:configuration_helper", "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", diff --git a/interfaces/inner_api/ability_manager/BUILD.gn b/interfaces/inner_api/ability_manager/BUILD.gn index d6a020e0d3d..d7a479e711f 100644 --- a/interfaces/inner_api/ability_manager/BUILD.gn +++ b/interfaces/inner_api/ability_manager/BUILD.gn @@ -140,6 +140,7 @@ ohos_shared_library("ability_manager") { public_deps = [ ":ability_connect_callback_stub" ] deps = [ + ":ability_connect_callback_stub", ":ability_start_options", ":ability_start_setting", ":mission_info", diff --git a/interfaces/inner_api/extension_manager/BUILD.gn b/interfaces/inner_api/extension_manager/BUILD.gn index 67c92840b0d..e01a8cad3b1 100755 --- a/interfaces/inner_api/extension_manager/BUILD.gn +++ b/interfaces/inner_api/extension_manager/BUILD.gn @@ -49,8 +49,11 @@ ohos_shared_library("extension_manager") { public_configs = [ ":extension_manager_public_config" ] public_deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub" ] - - deps = [ "${ability_runtime_services_path}/common:hitrace_chain_util" ] + + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${ability_runtime_services_path}/common:hitrace_chain_util", + ] external_deps = [ "ability_base:want", diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index d2d5de1a415..2bba8faf82b 100644 --- a/services/abilitymgr/BUILD.gn +++ b/services/abilitymgr/BUILD.gn @@ -140,6 +140,7 @@ ohos_shared_library("abilityms") { "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_innerkits_path}/session_handler:session_handler", + "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", diff --git a/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn b/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn index fea40f10aee..f7d03acab9e 100644 --- a/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn @@ -52,8 +52,10 @@ ohos_fuzztest("AbilityAppMgrAppRunningManagerFuzzTest") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", + "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${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/abilityconnectionstub_fuzzer/BUILD.gn b/test/fuzztest/abilityconnectionstub_fuzzer/BUILD.gn index 0bb04b5efbd..6e646a17266 100755 --- a/test/fuzztest/abilityconnectionstub_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityconnectionstub_fuzzer/BUILD.gn @@ -36,6 +36,7 @@ ohos_fuzztest("AbilityConnectionStubFuzzTest") { configs = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager_public_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_native_path}/ability/native:abilitykit_native", diff --git a/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn index 396671d205a..cf576401273 100644 --- a/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn @@ -56,6 +56,7 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteManagerFuzzTest") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_innerkits_path}/app_manager:app_manager", diff --git a/test/fuzztest/appmgrrest_fuzzer/BUILD.gn b/test/fuzztest/appmgrrest_fuzzer/BUILD.gn index b239b0ab2e2..6266a474a25 100755 --- a/test/fuzztest/appmgrrest_fuzzer/BUILD.gn +++ b/test/fuzztest/appmgrrest_fuzzer/BUILD.gn @@ -56,6 +56,8 @@ ohos_fuzztest("AppMgrRestFuzzTest") { "napi:ace_napi", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "window_manager:libdm", + "window_manager:libwm", ] if (ability_runtime_graphics) { diff --git a/test/fuzztest/assertfaultcallbackdeathmgr_fuzzer/BUILD.gn b/test/fuzztest/assertfaultcallbackdeathmgr_fuzzer/BUILD.gn index 6c33c1aa60c..92f8d24cf84 100644 --- a/test/fuzztest/assertfaultcallbackdeathmgr_fuzzer/BUILD.gn +++ b/test/fuzztest/assertfaultcallbackdeathmgr_fuzzer/BUILD.gn @@ -50,6 +50,7 @@ ohos_fuzztest("AssertFaultCallbackDeathMgrFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_native_path}/ability/native:abilitykit_native", diff --git a/test/fuzztest/connectability_fuzzer/BUILD.gn b/test/fuzztest/connectability_fuzzer/BUILD.gn index a228c3559dc..41ce104db8c 100755 --- a/test/fuzztest/connectability_fuzzer/BUILD.gn +++ b/test/fuzztest/connectability_fuzzer/BUILD.gn @@ -50,6 +50,8 @@ ohos_fuzztest("ConnectAbilityFuzzTest") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:app_context_utils", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", ] external_deps = [ diff --git a/test/fuzztest/startserviceextensionability_fuzzer/BUILD.gn b/test/fuzztest/startserviceextensionability_fuzzer/BUILD.gn index 969f4610b00..4e55c54df72 100755 --- a/test/fuzztest/startserviceextensionability_fuzzer/BUILD.gn +++ b/test/fuzztest/startserviceextensionability_fuzzer/BUILD.gn @@ -38,6 +38,7 @@ ohos_fuzztest("StartServiceExtensionAbilityFuzzTest") { configs = [] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/dataobs_manager:dataobs_manager", "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:abilitykit_native", diff --git a/test/fuzztest/stopserviceextensionability_fuzzer/BUILD.gn b/test/fuzztest/stopserviceextensionability_fuzzer/BUILD.gn index cf9067a1551..2687aabf709 100644 --- a/test/fuzztest/stopserviceextensionability_fuzzer/BUILD.gn +++ b/test/fuzztest/stopserviceextensionability_fuzzer/BUILD.gn @@ -39,12 +39,14 @@ ohos_fuzztest("StopServiceExtensionAbilityFuzzTest") { configs = [] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/dataobs_manager:dataobs_manager", "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:app_context_utils", "${ability_runtime_native_path}/appkit:appkit_delegator", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] external_deps = [ diff --git a/test/fuzztest/terminateability_fuzzer/BUILD.gn b/test/fuzztest/terminateability_fuzzer/BUILD.gn index ef545206a4a..1127a76cb7c 100644 --- a/test/fuzztest/terminateability_fuzzer/BUILD.gn +++ b/test/fuzztest/terminateability_fuzzer/BUILD.gn @@ -39,6 +39,7 @@ ohos_fuzztest("TerminateAbilityFuzzTest") { configs = [] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/dataobs_manager:dataobs_manager", "${ability_runtime_native_path}/ability:ability_context_native", @@ -46,6 +47,7 @@ ohos_fuzztest("TerminateAbilityFuzzTest") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:app_context_utils", "${ability_runtime_native_path}/appkit:appkit_delegator", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_services_path}/abilitymgr:abilityms", ] diff --git a/test/moduletest/ability_caller_fw_module_test/BUILD.gn b/test/moduletest/ability_caller_fw_module_test/BUILD.gn index 416b193f5de..261d76dbf24 100644 --- a/test/moduletest/ability_caller_fw_module_test/BUILD.gn +++ b/test/moduletest/ability_caller_fw_module_test/BUILD.gn @@ -37,9 +37,12 @@ ohos_moduletest("ability_caller_fw_module_test") { configs = [ ":module_private_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -49,6 +52,7 @@ ohos_moduletest("ability_caller_fw_module_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", @@ -56,6 +60,7 @@ ohos_moduletest("ability_caller_fw_module_test") { "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "window_manager:sms", ] } diff --git a/test/moduletest/ability_test/BUILD.gn b/test/moduletest/ability_test/BUILD.gn index 51fbcb6b024..757476e6e01 100644 --- a/test/moduletest/ability_test/BUILD.gn +++ b/test/moduletest/ability_test/BUILD.gn @@ -58,9 +58,11 @@ ohos_moduletest("ability_moduletest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -74,6 +76,7 @@ ohos_moduletest("ability_moduletest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", @@ -87,6 +90,7 @@ ohos_moduletest("ability_moduletest") { "relational_store:native_rdb", "resource_management:global_resmgr", "samgr:samgr_proxy", + "window_manager:sms", ] if (ability_runtime_graphics) { @@ -122,6 +126,8 @@ ohos_moduletest("ability_conetxt_test") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -134,6 +140,7 @@ ohos_moduletest("ability_conetxt_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", @@ -146,6 +153,7 @@ ohos_moduletest("ability_conetxt_test") { "relational_store:native_rdb", "resource_management:global_resmgr", "samgr:samgr_proxy", + "window_manager:sms", ] if (ability_runtime_graphics) { external_deps += [ @@ -166,6 +174,7 @@ ohos_moduletest("ability_thread_call_request_module_test") { "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -177,11 +186,13 @@ ohos_moduletest("ability_thread_call_request_module_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "window_manager:sms", ] } @@ -208,6 +219,7 @@ ohos_moduletest("data_ability_operation_moduletest") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", + "${ability_runtime_innerkits_path}/runtime:runtime", ] external_deps = [ @@ -220,6 +232,7 @@ ohos_moduletest("data_ability_operation_moduletest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", @@ -232,6 +245,7 @@ ohos_moduletest("data_ability_operation_moduletest") { "relational_store:native_rdb", "resource_management:global_resmgr", "samgr:samgr_proxy", + "window_manager:sms", ] if (ability_runtime_graphics) { @@ -267,6 +281,8 @@ ohos_moduletest("data_ability_helper_module_test") { "${ability_runtime_native_path}/ability/native:data_ability_helper", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -286,6 +302,7 @@ ohos_moduletest("data_ability_helper_module_test") { "relational_store:native_appdatafwk", "relational_store:native_dataability", "relational_store:native_rdb", + "window_manager:sms", ] if (ability_runtime_graphics) { @@ -315,6 +332,7 @@ ohos_moduletest("ability_post_event_timeout_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:data_ability_helper", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ diff --git a/test/moduletest/ipc_ability_connect_test/BUILD.gn b/test/moduletest/ipc_ability_connect_test/BUILD.gn index 266d323032f..838c70dcac8 100644 --- a/test/moduletest/ipc_ability_connect_test/BUILD.gn +++ b/test/moduletest/ipc_ability_connect_test/BUILD.gn @@ -28,6 +28,9 @@ ohos_moduletest("IpcAbilityConnectModuleTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${ability_runtime_native_path}/appkit:app_context_utils", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", ] diff --git a/test/sample/demo_ui_extension/native/demo_ui_extension_ability/BUILD.gn b/test/sample/demo_ui_extension/native/demo_ui_extension_ability/BUILD.gn index 992c95fdd1f..daf40bad74d 100644 --- a/test/sample/demo_ui_extension/native/demo_ui_extension_ability/BUILD.gn +++ b/test/sample/demo_ui_extension/native/demo_ui_extension_ability/BUILD.gn @@ -44,11 +44,14 @@ ohos_shared_library("demo_ui_extension") { # If not in ability_runtime repo, use external_deps deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:ui_extension", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/appkit:app_context", ] diff --git a/test/unittest/ability_connect_callback_proxy_test/BUILD.gn b/test/unittest/ability_connect_callback_proxy_test/BUILD.gn index 97b20c8f4c8..6fa254d71d7 100644 --- a/test/unittest/ability_connect_callback_proxy_test/BUILD.gn +++ b/test/unittest/ability_connect_callback_proxy_test/BUILD.gn @@ -35,7 +35,10 @@ ohos_unittest("ability_connect_callback_proxy_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/appkit:app_context_utils", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", diff --git a/test/unittest/ability_connect_callback_stub_test/BUILD.gn b/test/unittest/ability_connect_callback_stub_test/BUILD.gn index b0ae2ee1be7..f721294e712 100644 --- a/test/unittest/ability_connect_callback_stub_test/BUILD.gn +++ b/test/unittest/ability_connect_callback_stub_test/BUILD.gn @@ -35,6 +35,7 @@ ohos_unittest("ability_connect_callback_stub_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", @@ -89,6 +90,8 @@ ohos_unittest("ability_connect_callback_recipient_test") { deps = [ "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core:appexecfwk_appmgr_mock", diff --git a/test/unittest/ability_connect_manager_first_test/BUILD.gn b/test/unittest/ability_connect_manager_first_test/BUILD.gn index 288a1e86612..4ffaa4b8a68 100644 --- a/test/unittest/ability_connect_manager_first_test/BUILD.gn +++ b/test/unittest/ability_connect_manager_first_test/BUILD.gn @@ -49,6 +49,7 @@ ohos_unittest("ability_connect_manager_first_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", diff --git a/test/unittest/ability_connect_manager_fourth_test/BUILD.gn b/test/unittest/ability_connect_manager_fourth_test/BUILD.gn index e7c63de6608..a41b435b0a2 100644 --- a/test/unittest/ability_connect_manager_fourth_test/BUILD.gn +++ b/test/unittest/ability_connect_manager_fourth_test/BUILD.gn @@ -49,6 +49,7 @@ ohos_unittest("ability_connect_manager_fourth_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", diff --git a/test/unittest/ability_connect_manager_test/BUILD.gn b/test/unittest/ability_connect_manager_test/BUILD.gn index 8ef8694ee5e..58cb590bfe3 100644 --- a/test/unittest/ability_connect_manager_test/BUILD.gn +++ b/test/unittest/ability_connect_manager_test/BUILD.gn @@ -49,6 +49,7 @@ ohos_unittest("ability_connect_manager_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", diff --git a/test/unittest/ability_connection_test/BUILD.gn b/test/unittest/ability_connection_test/BUILD.gn index 8213e46f4fd..dc4e1796dce 100644 --- a/test/unittest/ability_connection_test/BUILD.gn +++ b/test/unittest/ability_connection_test/BUILD.gn @@ -25,7 +25,10 @@ ohos_unittest("ability_connection_test") { configs = [] - deps = [ "${ability_runtime_native_path}/ability:ability_context_native" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${ability_runtime_native_path}/ability:ability_context_native", + ] external_deps = [ "ability_base:want", diff --git a/test/unittest/ability_extension_base_test/BUILD.gn b/test/unittest/ability_extension_base_test/BUILD.gn index a2a6c3bea90..e716335899c 100644 --- a/test/unittest/ability_extension_base_test/BUILD.gn +++ b/test/unittest/ability_extension_base_test/BUILD.gn @@ -34,7 +34,10 @@ ohos_unittest("ability_extension_base_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", ] diff --git a/test/unittest/ability_extension_context_test/BUILD.gn b/test/unittest/ability_extension_context_test/BUILD.gn index 907b3d55603..f3deb8dd7f6 100644 --- a/test/unittest/ability_extension_context_test/BUILD.gn +++ b/test/unittest/ability_extension_context_test/BUILD.gn @@ -35,6 +35,8 @@ ohos_unittest("ability_extension_context_test") { deps = [ "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", ] diff --git a/test/unittest/ability_extension_module_loader_test/BUILD.gn b/test/unittest/ability_extension_module_loader_test/BUILD.gn index c64dc805ae3..4a81c8017d4 100644 --- a/test/unittest/ability_extension_module_loader_test/BUILD.gn +++ b/test/unittest/ability_extension_module_loader_test/BUILD.gn @@ -38,6 +38,7 @@ ohos_unittest("ability_extension_module_loader_test") { "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_napi_path}/dialog_request_info:dialog_request_info", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:service_extension_module", ] diff --git a/test/unittest/ability_extension_test/BUILD.gn b/test/unittest/ability_extension_test/BUILD.gn index a473d354ae9..41e400c2ea3 100644 --- a/test/unittest/ability_extension_test/BUILD.gn +++ b/test/unittest/ability_extension_test/BUILD.gn @@ -34,7 +34,11 @@ ohos_unittest("ability_extension_test") { } deps = [ + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/appkit:appkit_native", ] diff --git a/test/unittest/ability_manager_client_branch_test/BUILD.gn b/test/unittest/ability_manager_client_branch_test/BUILD.gn index 44a1bc89fc6..80c618af968 100644 --- a/test/unittest/ability_manager_client_branch_test/BUILD.gn +++ b/test/unittest/ability_manager_client_branch_test/BUILD.gn @@ -39,6 +39,7 @@ ohos_unittest("ability_manager_client_branch_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_innerkits_path}/app_manager:app_manager", diff --git a/test/unittest/ability_manager_proxy_fourth_test/BUILD.gn b/test/unittest/ability_manager_proxy_fourth_test/BUILD.gn index 087ff4d219c..359ca34f2b4 100644 --- a/test/unittest/ability_manager_proxy_fourth_test/BUILD.gn +++ b/test/unittest/ability_manager_proxy_fourth_test/BUILD.gn @@ -50,6 +50,7 @@ ohos_unittest("ability_manager_proxy_fourth_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", diff --git a/test/unittest/ability_manager_proxy_test/BUILD.gn b/test/unittest/ability_manager_proxy_test/BUILD.gn index a6bd65ae258..64f644eecb2 100644 --- a/test/unittest/ability_manager_proxy_test/BUILD.gn +++ b/test/unittest/ability_manager_proxy_test/BUILD.gn @@ -43,6 +43,7 @@ ohos_unittest("ability_manager_proxy_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", diff --git a/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn b/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn index 5d4fac76b8a..c0951c75472 100644 --- a/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn @@ -248,6 +248,7 @@ ohos_unittest("ability_manager_service_fourteenth_test") { "${ability_runtime_innerkits_path}/error_utils:ability_runtime_error_util", "${ability_runtime_innerkits_path}/session_handler:session_handler", "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr", + "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", diff --git a/test/unittest/ability_manager_service_second_test/BUILD.gn b/test/unittest/ability_manager_service_second_test/BUILD.gn index beb252eefad..98f71a218a6 100644 --- a/test/unittest/ability_manager_service_second_test/BUILD.gn +++ b/test/unittest/ability_manager_service_second_test/BUILD.gn @@ -249,6 +249,7 @@ ohos_unittest("ability_manager_service_second_test") { "${ability_runtime_innerkits_path}/error_utils:ability_runtime_error_util", "${ability_runtime_innerkits_path}/session_handler:session_handler", "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr", + "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", diff --git a/test/unittest/ability_manager_service_third_test/BUILD.gn b/test/unittest/ability_manager_service_third_test/BUILD.gn index c469e6fe314..4f2abac1891 100644 --- a/test/unittest/ability_manager_service_third_test/BUILD.gn +++ b/test/unittest/ability_manager_service_third_test/BUILD.gn @@ -71,6 +71,7 @@ ohos_unittest("ability_manager_service_third_test") { "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/global/freeze:freeze_util", diff --git a/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn b/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn index 6e9bde5f9f6..ac653d68a85 100644 --- a/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn @@ -249,6 +249,7 @@ ohos_unittest("ability_manager_service_thirteenth_test") { "${ability_runtime_innerkits_path}/error_utils:ability_runtime_error_util", "${ability_runtime_innerkits_path}/session_handler:session_handler", "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr", + "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", diff --git a/test/unittest/ability_manager_stub_second_test/BUILD.gn b/test/unittest/ability_manager_stub_second_test/BUILD.gn index 6ffb3d3b6cc..b293b6b0f92 100644 --- a/test/unittest/ability_manager_stub_second_test/BUILD.gn +++ b/test/unittest/ability_manager_stub_second_test/BUILD.gn @@ -47,6 +47,7 @@ ohos_unittest("ability_manager_stub_second_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", diff --git a/test/unittest/ability_manager_stub_test/BUILD.gn b/test/unittest/ability_manager_stub_test/BUILD.gn index 0b99d793c44..c0f44e1fa56 100644 --- a/test/unittest/ability_manager_stub_test/BUILD.gn +++ b/test/unittest/ability_manager_stub_test/BUILD.gn @@ -47,6 +47,7 @@ ohos_unittest("ability_manager_stub_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_native_path}/ability/native:abilitykit_native", diff --git a/test/unittest/ability_record_mgr_test/BUILD.gn b/test/unittest/ability_record_mgr_test/BUILD.gn index c0d1b1b82a1..80345f71a0b 100644 --- a/test/unittest/ability_record_mgr_test/BUILD.gn +++ b/test/unittest/ability_record_mgr_test/BUILD.gn @@ -38,6 +38,7 @@ ohos_unittest("ability_record_mgr_test") { if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] } + deps = [ "${ability_runtime_native_path}/ability/native:abilitykit_utils" ] external_deps = [ "ability_runtime:abilitykit_native", diff --git a/test/unittest/ability_record_second_test/BUILD.gn b/test/unittest/ability_record_second_test/BUILD.gn index ce8f5b8c37a..7f4686c82f6 100644 --- a/test/unittest/ability_record_second_test/BUILD.gn +++ b/test/unittest/ability_record_second_test/BUILD.gn @@ -50,6 +50,7 @@ ohos_unittest("ability_record_second_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/abilitymgr:abilityms", diff --git a/test/unittest/ability_record_test/BUILD.gn b/test/unittest/ability_record_test/BUILD.gn index 05aa7daba8c..a004569611f 100644 --- a/test/unittest/ability_record_test/BUILD.gn +++ b/test/unittest/ability_record_test/BUILD.gn @@ -45,6 +45,7 @@ ohos_unittest("ability_record_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", "${ability_runtime_innerkits_path}/ability_manager:mission_info", diff --git a/test/unittest/ability_service_extension_test/BUILD.gn b/test/unittest/ability_service_extension_test/BUILD.gn index 398c5223ede..125cb626959 100644 --- a/test/unittest/ability_service_extension_test/BUILD.gn +++ b/test/unittest/ability_service_extension_test/BUILD.gn @@ -45,6 +45,7 @@ ohos_unittest("ability_service_extension_test") { deps = [ "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:configuration_helper", "${ability_runtime_native_path}/ability/native:service_extension", @@ -65,6 +66,7 @@ ohos_unittest("ability_service_extension_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", diff --git a/test/unittest/app_recovery_test/BUILD.gn b/test/unittest/app_recovery_test/BUILD.gn index 93b2719aebf..a85f4c4d5ab 100644 --- a/test/unittest/app_recovery_test/BUILD.gn +++ b/test/unittest/app_recovery_test/BUILD.gn @@ -36,6 +36,7 @@ ohos_unittest("AppRecoveryUnitTest") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/dataobs_manager:dataobs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", diff --git a/test/unittest/app_service_extension_context_test/BUILD.gn b/test/unittest/app_service_extension_context_test/BUILD.gn index a136e622849..c7800260cb8 100644 --- a/test/unittest/app_service_extension_context_test/BUILD.gn +++ b/test/unittest/app_service_extension_context_test/BUILD.gn @@ -39,11 +39,14 @@ ohos_unittest("app_service_extension_context_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:app_service_extension", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/appkit:app_context", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", diff --git a/test/unittest/app_service_extension_test/BUILD.gn b/test/unittest/app_service_extension_test/BUILD.gn index ddb3ff10c52..3c0e74d3706 100644 --- a/test/unittest/app_service_extension_test/BUILD.gn +++ b/test/unittest/app_service_extension_test/BUILD.gn @@ -45,6 +45,7 @@ ohos_unittest("app_service_extension_test") { deps = [ "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:app_service_extension", "${ability_runtime_native_path}/ability/native:configuration_helper", @@ -65,6 +66,7 @@ ohos_unittest("app_service_extension_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", diff --git a/test/unittest/appkit/ohos_application_first_test/BUILD.gn b/test/unittest/appkit/ohos_application_first_test/BUILD.gn index a5cf66fd1c9..9a9ef2fee88 100644 --- a/test/unittest/appkit/ohos_application_first_test/BUILD.gn +++ b/test/unittest/appkit/ohos_application_first_test/BUILD.gn @@ -57,6 +57,7 @@ ohos_unittest("ohos_application_first_test") { } deps = [ + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", "${ability_runtime_native_path}/appkit:app_context", @@ -78,6 +79,7 @@ ohos_unittest("ohos_application_first_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "faultloggerd:libdfx_dumpcatcher", "faultloggerd:libfaultloggerd", "googletest:gmock_main", diff --git a/test/unittest/appkit/ohos_application_test/BUILD.gn b/test/unittest/appkit/ohos_application_test/BUILD.gn index 1d8cd7dbe65..02ea72f7498 100644 --- a/test/unittest/appkit/ohos_application_test/BUILD.gn +++ b/test/unittest/appkit/ohos_application_test/BUILD.gn @@ -48,7 +48,9 @@ ohos_unittest("ohos_application_test") { } deps = [ + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:ability_thread", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", @@ -69,6 +71,7 @@ ohos_unittest("ohos_application_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "faultloggerd:libdfx_dumpcatcher", "faultloggerd:libfaultloggerd", "googletest:gmock_main", 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 4aa1a5a6580..e275d56c9c1 100644 --- a/test/unittest/assert_fault_callback_death_mgr_test/BUILD.gn +++ b/test/unittest/assert_fault_callback_death_mgr_test/BUILD.gn @@ -53,6 +53,7 @@ ohos_unittest("assert_fault_callback_death_mgr_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", diff --git a/test/unittest/authorization_result_test/BUILD.gn b/test/unittest/authorization_result_test/BUILD.gn index f3f5298885a..cb53ef23856 100644 --- a/test/unittest/authorization_result_test/BUILD.gn +++ b/test/unittest/authorization_result_test/BUILD.gn @@ -35,6 +35,7 @@ ohos_unittest("authorization_result_test") { "googletest:gtest_main", "ipc:ipc_core", "napi:ace_napi", + "resource_management:global_resmgr", ] } diff --git a/test/unittest/auto_fill_extension_context_test/BUILD.gn b/test/unittest/auto_fill_extension_context_test/BUILD.gn index a5031426527..37b0859f174 100644 --- a/test/unittest/auto_fill_extension_context_test/BUILD.gn +++ b/test/unittest/auto_fill_extension_context_test/BUILD.gn @@ -38,6 +38,8 @@ ohos_unittest("auto_fill_extension_context_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:ui_extension", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", diff --git a/test/unittest/call_record_test/BUILD.gn b/test/unittest/call_record_test/BUILD.gn index 09a97657e7f..9b570a91d58 100644 --- a/test/unittest/call_record_test/BUILD.gn +++ b/test/unittest/call_record_test/BUILD.gn @@ -46,6 +46,7 @@ ohos_unittest("call_record_test") { ] external_deps = [ + "ability_base:configuration", "ability_base:want", "ffrt:libffrt", "googletest:gmock_main", diff --git a/test/unittest/cj_ability_connect_callback_object_test/BUILD.gn b/test/unittest/cj_ability_connect_callback_object_test/BUILD.gn index a2f7117e87f..6d10005391a 100644 --- a/test/unittest/cj_ability_connect_callback_object_test/BUILD.gn +++ b/test/unittest/cj_ability_connect_callback_object_test/BUILD.gn @@ -38,7 +38,10 @@ ohos_unittest("cj_ability_connect_callback_object_test") { if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "${ability_runtime_innerkits_path}/runtime:runtime" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${ability_runtime_innerkits_path}/runtime:runtime", + ] external_deps = [ "ability_base:want", diff --git a/test/unittest/cj_ability_context_object_test/BUILD.gn b/test/unittest/cj_ability_context_object_test/BUILD.gn index d499e9521ef..d002fb38387 100644 --- a/test/unittest/cj_ability_context_object_test/BUILD.gn +++ b/test/unittest/cj_ability_context_object_test/BUILD.gn @@ -37,6 +37,7 @@ ohos_unittest("cj_ability_context_object_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", diff --git a/test/unittest/cj_ability_object_test/BUILD.gn b/test/unittest/cj_ability_object_test/BUILD.gn index 397c24683e6..3cd4b0938e2 100644 --- a/test/unittest/cj_ability_object_test/BUILD.gn +++ b/test/unittest/cj_ability_object_test/BUILD.gn @@ -56,6 +56,7 @@ ohos_unittest("cj_ability_object_test") { "common_event_service:cesfwk_innerkits", "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", diff --git a/test/unittest/cj_ability_stage_object_test/BUILD.gn b/test/unittest/cj_ability_stage_object_test/BUILD.gn index 2f3502ed99c..d95281aacb7 100644 --- a/test/unittest/cj_ability_stage_object_test/BUILD.gn +++ b/test/unittest/cj_ability_stage_object_test/BUILD.gn @@ -52,6 +52,7 @@ ohos_unittest("cj_ability_stage_object_test") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:configuration_helper", @@ -75,6 +76,7 @@ ohos_unittest("cj_ability_stage_object_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", diff --git a/test/unittest/cj_ability_stage_test/BUILD.gn b/test/unittest/cj_ability_stage_test/BUILD.gn index 65d21dfbae7..3da08da691b 100644 --- a/test/unittest/cj_ability_stage_test/BUILD.gn +++ b/test/unittest/cj_ability_stage_test/BUILD.gn @@ -55,6 +55,7 @@ ohos_unittest("cj_ability_stage_test") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:configuration_helper", @@ -80,6 +81,7 @@ ohos_unittest("cj_ability_stage_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", diff --git a/test/unittest/cj_ui_ability_test/BUILD.gn b/test/unittest/cj_ui_ability_test/BUILD.gn index 2009baca552..967fcacce94 100644 --- a/test/unittest/cj_ui_ability_test/BUILD.gn +++ b/test/unittest/cj_ui_ability_test/BUILD.gn @@ -48,11 +48,13 @@ ohos_unittest("cj_ui_ability_test") { ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability:ability_context_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:configuration_helper", @@ -64,6 +66,7 @@ ohos_unittest("cj_ui_ability_test") { "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_native_path}/insight_intent/insight_intent_context:insightintentcontext", "${ability_runtime_path}/frameworks/cj/ffi:cj_ability_ffi", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_services_path}/common:event_report", ] @@ -81,6 +84,7 @@ ohos_unittest("cj_ui_ability_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", diff --git a/test/unittest/configuration_test/BUILD.gn b/test/unittest/configuration_test/BUILD.gn index 6d309101ffc..2e06d0c892f 100644 --- a/test/unittest/configuration_test/BUILD.gn +++ b/test/unittest/configuration_test/BUILD.gn @@ -41,6 +41,7 @@ ohos_unittest("configuration_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", diff --git a/test/unittest/connection_record_test/BUILD.gn b/test/unittest/connection_record_test/BUILD.gn index 2a719dc8873..7ec3360440f 100644 --- a/test/unittest/connection_record_test/BUILD.gn +++ b/test/unittest/connection_record_test/BUILD.gn @@ -40,6 +40,7 @@ ohos_unittest("connection_record_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", diff --git a/test/unittest/continuation_test/remote_register_service_test/continuation_connector_test/BUILD.gn b/test/unittest/continuation_test/remote_register_service_test/continuation_connector_test/BUILD.gn index 3f8dcfda32e..6b50f7c29b1 100644 --- a/test/unittest/continuation_test/remote_register_service_test/continuation_connector_test/BUILD.gn +++ b/test/unittest/continuation_test/remote_register_service_test/continuation_connector_test/BUILD.gn @@ -48,7 +48,10 @@ ohos_unittest("continuation_connector_test") { if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "${ability_runtime_native_path}/ability/native:abilitykit_native" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${ability_runtime_native_path}/ability/native:abilitykit_native", + ] external_deps = [ "ability_base:want", @@ -56,11 +59,13 @@ ohos_unittest("continuation_connector_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "napi:ace_napi", + "window_manager:sms", ] if (background_task_mgr_continuous_task_enable) { 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 69e91415a58..cc08f8ff1b7 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 @@ -98,6 +98,7 @@ ohos_unittest("continuation_register_manager_proxy_test") { "ipc:ipc_core", "napi:ace_napi", "resource_management:global_resmgr", + "window_manager:sms", ] if (background_task_mgr_continuous_task_enable) { 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 21b23e0f964..ea874e4c118 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 @@ -98,6 +98,7 @@ ohos_unittest("continuation_register_manager_test") { "ipc:ipc_core", "napi:ace_napi", "resource_management:global_resmgr", + "window_manager:sms", ] if (background_task_mgr_continuous_task_enable) { diff --git a/test/unittest/extension_config_mgr_test/BUILD.gn b/test/unittest/extension_config_mgr_test/BUILD.gn index abc2a1486fc..f5c3cf398c6 100644 --- a/test/unittest/extension_config_mgr_test/BUILD.gn +++ b/test/unittest/extension_config_mgr_test/BUILD.gn @@ -23,7 +23,11 @@ ohos_unittest("extension_config_mgr_test") { configs = [ "${ability_runtime_services_path}/common:common_config" ] - deps = [ "${ability_runtime_native_path}/ability/native:abilitykit_native" ] + deps = [ + "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:extensionkit_native", + "${ability_runtime_innerkits_path}/runtime:runtime", + ] external_deps = [ "bundle_framework:appexecfwk_base", diff --git a/test/unittest/extension_manager_client_test/BUILD.gn b/test/unittest/extension_manager_client_test/BUILD.gn index 6e0d72a0bc8..a05bbca7e5c 100644 --- a/test/unittest/extension_manager_client_test/BUILD.gn +++ b/test/unittest/extension_manager_client_test/BUILD.gn @@ -41,6 +41,7 @@ ohos_unittest("extension_manager_client_test") { "hilog:libhilog", "image_framework:image_native", "ipc:ipc_core", + "window_manager:sms", ] } diff --git a/test/unittest/frameworks_kits_ability_ability_runtime_test/BUILD.gn b/test/unittest/frameworks_kits_ability_ability_runtime_test/BUILD.gn index d470d773849..e28dc2fd604 100644 --- a/test/unittest/frameworks_kits_ability_ability_runtime_test/BUILD.gn +++ b/test/unittest/frameworks_kits_ability_ability_runtime_test/BUILD.gn @@ -40,10 +40,13 @@ ohos_unittest("ability_context_impl_test") { ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -55,6 +58,7 @@ ohos_unittest("ability_context_impl_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", @@ -102,6 +106,7 @@ ohos_unittest("ability_context_impl_second_test") { "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", ] external_deps = [ @@ -207,6 +212,8 @@ ohos_unittest("local_call_container_ut_test") { "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", ] external_deps = [ @@ -214,6 +221,7 @@ ohos_unittest("local_call_container_ut_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", @@ -221,6 +229,7 @@ ohos_unittest("local_call_container_ut_test") { "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "window_manager:sms", ] } @@ -241,6 +250,7 @@ ohos_unittest("local_call_record_ut_test") { "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", + "${ability_runtime_innerkits_path}/runtime:runtime", ] external_deps = [ @@ -248,6 +258,7 @@ ohos_unittest("local_call_record_ut_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", @@ -255,6 +266,7 @@ ohos_unittest("local_call_record_ut_test") { "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "window_manager:sms", ] } @@ -309,6 +321,7 @@ ohos_unittest("ability_context_impl_new_test") { "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", ] external_deps = [ diff --git a/test/unittest/frameworks_kits_ability_native_test/BUILD.gn b/test/unittest/frameworks_kits_ability_native_test/BUILD.gn index 1796dc93a13..bee08ae9485 100644 --- a/test/unittest/frameworks_kits_ability_native_test/BUILD.gn +++ b/test/unittest/frameworks_kits_ability_native_test/BUILD.gn @@ -81,11 +81,13 @@ ohos_unittest("ability_test") { configs = [ ":module_private_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:configuration_helper", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", "${ability_runtime_native_path}/appkit:app_context", @@ -234,6 +236,7 @@ ohos_unittest("ability_context_test") { configs = [ ":module_ability_context_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_napi_path}/inner/napi_ability_common:napi_ability_common", "${ability_runtime_napi_path}/inner/napi_common:napi_common", @@ -284,6 +287,8 @@ ohos_unittest("page_ability_impl_test") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -304,6 +309,7 @@ ohos_unittest("page_ability_impl_test") { "napi:ace_napi", "resource_management:global_resmgr", "samgr:samgr_proxy", + "window_manager:sms", ] } } @@ -323,6 +329,8 @@ ohos_unittest("service_ability_impl_test") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -340,6 +348,7 @@ ohos_unittest("service_ability_impl_test") { "napi:ace_napi", "resource_management:global_resmgr", "samgr:samgr_proxy", + "window_manager:sms", ] if (ability_runtime_graphics) { @@ -417,6 +426,7 @@ ohos_unittest("data_ability_helper_test") { "${ability_runtime_native_path}/ability/native:data_ability_helper", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_services_path}/abilitymgr:abilityms", + "${ability_runtime_innerkits_path}/runtime:runtime", ] external_deps = [ @@ -447,6 +457,7 @@ ohos_unittest("data_ability_helper_test") { "relational_store:rdb_data_ability_adapter", "resource_management:global_resmgr", "samgr:samgr_proxy", + "window_manager:sms", ] if (ability_runtime_graphics) { @@ -484,6 +495,7 @@ ohos_unittest("data_ability_helper_impl_test") { "${ability_runtime_native_path}/ability/native:data_ability_helper", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_services_path}/abilitymgr:abilityms", + "${ability_runtime_innerkits_path}/runtime:runtime", ] external_deps = [ "ability_base:base", @@ -634,6 +646,9 @@ ohos_unittest("ability_impl_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", ] external_deps = [ @@ -697,6 +712,9 @@ ohos_unittest("ui_ability_impl_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", ] external_deps = [ @@ -774,6 +792,8 @@ ohos_unittest("ability_thread_test") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_services_path}/dataobsmgr:dataobsms_static", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", ] external_deps = [ @@ -859,6 +879,8 @@ ohos_unittest("fa_ability_thread_test") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_services_path}/dataobsmgr:dataobsms_static", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", ] external_deps = [ @@ -916,6 +938,8 @@ ohos_unittest("extension_ability_thread_test") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", ] external_deps = [ @@ -982,6 +1006,7 @@ ohos_unittest("ui_ability_thread_test") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_services_path}/dataobsmgr:dataobsms_static", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -1094,6 +1119,7 @@ ohos_unittest("ability_process_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", + "${ability_runtime_napi_path}/inner/napi_common:napi_common", ] external_deps = [ @@ -1142,6 +1168,8 @@ ohos_unittest("extension_test") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", ] external_deps = [ @@ -1167,6 +1195,7 @@ ohos_unittest("extension_test") { "relational_store:native_rdb", "resource_management:global_resmgr", "samgr:samgr_proxy", + "window_manager:sms", ] if (ability_runtime_graphics) { @@ -1192,6 +1221,9 @@ ohos_unittest("extension_second_test") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${ability_runtime_native_path}/ability/native:extensionkit_native", ] external_deps = [ @@ -1243,6 +1275,7 @@ ohos_unittest("form_extension_test") { "${ability_runtime_native_path}/ability/native:form_extension", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -1295,6 +1328,7 @@ ohos_unittest("ability_thread_call_request_test") { "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -1314,6 +1348,7 @@ ohos_unittest("ability_thread_call_request_test") { "napi:ace_napi", "resource_management:global_resmgr", "samgr:samgr_proxy", + "window_manager:sms", ] if (ability_runtime_graphics) { @@ -1365,6 +1400,7 @@ ohos_unittest("form_extension_provider_client_test") { "napi:ace_napi", "resource_management:global_resmgr", "samgr:samgr_proxy", + "window_manager:sms", ] } } @@ -1405,6 +1441,7 @@ ohos_unittest("data_ability_impl_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -1481,6 +1518,7 @@ ohos_unittest("data_ability_impl_file_secondpart_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -1548,6 +1586,7 @@ ohos_unittest("data_ability_impl_file_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -1617,6 +1656,7 @@ ohos_unittest("ability_thread_dataability_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -1720,6 +1760,8 @@ ohos_unittest("extension_impl_test") { "${ability_runtime_native_path}/ability/native:form_extension", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", ] external_deps = [ @@ -1774,6 +1816,7 @@ ohos_unittest("pac_map_test") { "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", + "cJSON:cjson", "samgr:samgr_proxy", ] @@ -1844,6 +1887,7 @@ ohos_unittest("ability_permission_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "googletest:gmock", "googletest:gmock_main", "googletest:gtest_main", @@ -1854,6 +1898,7 @@ ohos_unittest("ability_permission_test") { "napi:ace_napi", "resource_management:global_resmgr", "samgr:samgr_proxy", + "window_manager:sms", ] if (ability_runtime_graphics) { external_deps += [ "input:libmmi-client" ] @@ -1910,6 +1955,9 @@ ohos_unittest("ui_ability_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", ] external_deps = [ @@ -2039,6 +2087,7 @@ ohos_unittest("form_host_client_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -2095,6 +2144,8 @@ ohos_unittest("continuation_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", ] external_deps = [ @@ -2193,6 +2244,8 @@ ohos_unittest("new_ability_impl_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_path}/utils/global/freeze:freeze_util", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -2214,6 +2267,7 @@ ohos_unittest("new_ability_impl_test") { "resource_management:global_resmgr", "samgr:samgr_proxy", "window_manager:libwsutils", + "window_manager:sms", ] } } @@ -2274,6 +2328,8 @@ ohos_unittest("reserse_continuation_scheduler_primary_proxy_test") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_path}/utils/global/freeze:freeze_util", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -2294,6 +2350,7 @@ ohos_unittest("reserse_continuation_scheduler_primary_proxy_test") { "resource_management:global_resmgr", "samgr:samgr_proxy", "window_manager:libwsutils", + "window_manager:sms", ] } } @@ -2313,6 +2370,8 @@ ohos_unittest("distributed_client_test") { "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", ] external_deps = [ @@ -2359,6 +2418,8 @@ ohos_unittest("ability_window_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", ] external_deps = [ @@ -2433,6 +2494,7 @@ ohos_unittest("ability_handler_test") { "${ability_runtime_native_path}/appkit:app_context_utils", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -2496,6 +2558,7 @@ ohos_unittest("ability_impl_factory_test") { "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_services_path}/common:event_report", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -2527,6 +2590,9 @@ ohos_unittest("ability_impl_factory_test") { "relational_store:rdb_data_share_adapter", "samgr:samgr_proxy", "runtime_core:ani", + "window_manager:libwm", + "window_manager:libdm", + "window_manager:sms", ] if (ability_runtime_graphics) { @@ -2552,6 +2618,9 @@ ohos_unittest("ability_loader_test") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", "${ability_runtime_native_path}/appkit:app_context", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", ] external_deps = [ @@ -2592,6 +2661,7 @@ ohos_unittest("ability_local_record_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", + "${ability_runtime_innerkits_path}/runtime:runtime", ] external_deps = [ @@ -2608,6 +2678,7 @@ ohos_unittest("ability_local_record_test") { "napi:ace_napi", "resource_management:global_resmgr", "samgr:samgr_proxy", + "window_manager:sms", ] if (ability_runtime_graphics) { @@ -2647,6 +2718,7 @@ ohos_unittest("reverse_continuation_scheduler_replica_proxy_test") { "napi:ace_napi", "resource_management:global_resmgr", "samgr:samgr_proxy", + "window_manager:sms", ] if (ability_runtime_graphics) { @@ -2685,6 +2757,7 @@ ohos_unittest("reverse_continuation_scheduler_replica_stub_test") { "napi:ace_napi", "resource_management:global_resmgr", "samgr:samgr_proxy", + "window_manager:sms", ] if (ability_runtime_graphics) { @@ -2713,6 +2786,7 @@ ohos_unittest("ability_connection_manager_test") { "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", ] external_deps = [ @@ -2831,6 +2905,7 @@ ohos_unittest("action_extension_module_loader_test") { ] external_deps = [ + "ability_base:configuration", "ability_base:extractortool", "c_utils:utils", "googletest:gmock_main", @@ -2838,6 +2913,7 @@ ohos_unittest("action_extension_module_loader_test") { "hilog:libhilog", "ipc:ipc_napi", "napi:ace_napi", + "resource_management:global_resmgr", "samgr:samgr_proxy", ] @@ -2868,6 +2944,7 @@ ohos_unittest("action_extension_test") { "${ability_runtime_native_path}/ability/native:ui_extension", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -2913,6 +2990,7 @@ ohos_unittest("share_extension_module_loader_test") { "${ability_runtime_native_path}/ability/native:ui_extension", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -2956,6 +3034,7 @@ ohos_unittest("share_extension_test") { "${ability_runtime_native_path}/ability/native:ui_extension", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -3042,6 +3121,8 @@ ohos_unittest("auto_fill_extension_test") { "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:extensionkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -3059,6 +3140,8 @@ ohos_unittest("auto_fill_extension_test") { "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "window_manager:libwm", + "window_manager:libdm", ] if (ability_runtime_auto_fill) { deps += @@ -3092,6 +3175,7 @@ ohos_unittest("embedded_ui_extension_module_loader_test") { ] external_deps = [ + "ability_base:configuration", "ability_base:extractortool", "c_utils:utils", "googletest:gmock_main", @@ -3099,6 +3183,7 @@ ohos_unittest("embedded_ui_extension_module_loader_test") { "hilog:libhilog", "ipc:ipc_napi", "napi:ace_napi", + "resource_management:global_resmgr", "samgr:samgr_proxy", ] @@ -3129,6 +3214,8 @@ ohos_unittest("embedded_ui_extension_test") { "${ability_runtime_native_path}/ability/native:ui_extension", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", ] external_deps = [ @@ -3171,6 +3258,7 @@ ohos_unittest("app_module_checker_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:extensionkit_native", ] external_deps = [ @@ -3271,6 +3359,7 @@ ohos_unittest("js_ui_extension_Callback_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_napi_path}/inner/napi_common:napi_common", ] external_deps = [ @@ -3378,6 +3467,8 @@ ohos_unittest("ability_second_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", ] external_deps = [ diff --git a/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn b/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn index 87542990fb8..91d637e8aac 100644 --- a/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn +++ b/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn @@ -80,6 +80,7 @@ ohos_unittest("application_test") { "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:configuration_helper", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", "${ability_runtime_native_path}/appkit:app_context", @@ -98,6 +99,7 @@ ohos_unittest("application_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", @@ -151,6 +153,7 @@ ohos_unittest("context_impl_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -164,6 +167,7 @@ ohos_unittest("context_impl_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", @@ -211,6 +215,7 @@ ohos_unittest("context_impl_second_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -224,6 +229,7 @@ ohos_unittest("context_impl_second_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", @@ -271,6 +277,7 @@ ohos_unittest("context_impl_third_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -284,6 +291,7 @@ ohos_unittest("context_impl_third_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", @@ -325,6 +333,7 @@ ohos_unittest("context_container_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -337,6 +346,7 @@ ohos_unittest("context_container_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", @@ -390,6 +400,7 @@ ohos_unittest("overlay_event_subscriber_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -524,6 +535,8 @@ ohos_unittest("context_deal_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", ] external_deps = [ @@ -584,6 +597,7 @@ ohos_unittest("application_impl_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -595,6 +609,7 @@ ohos_unittest("application_impl_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", @@ -676,6 +691,7 @@ ohos_unittest("ability_stage_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", ] external_deps = [ @@ -727,6 +743,9 @@ ohos_unittest("form_extension_context_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", ] external_deps = [ @@ -837,6 +856,7 @@ ohos_unittest("context_container_by_mock_bms_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", @@ -845,6 +865,7 @@ ohos_unittest("context_container_by_mock_bms_test") { "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", + "window_manager:sms", ] } @@ -961,6 +982,7 @@ ohos_unittest("extension_plugin_info_test") { deps = [ "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/ability/native:extensionkit_native", ] external_deps = [ diff --git a/test/unittest/js_ability_context_test/BUILD.gn b/test/unittest/js_ability_context_test/BUILD.gn index 8e3a66d8c88..f78065a4f06 100644 --- a/test/unittest/js_ability_context_test/BUILD.gn +++ b/test/unittest/js_ability_context_test/BUILD.gn @@ -38,9 +38,12 @@ ohos_unittest("js_ability_context_test") { configs = [] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] external_deps = [ diff --git a/test/unittest/js_app_service_extension_test/BUILD.gn b/test/unittest/js_app_service_extension_test/BUILD.gn index b9ed1de6761..c655a6fd0a7 100644 --- a/test/unittest/js_app_service_extension_test/BUILD.gn +++ b/test/unittest/js_app_service_extension_test/BUILD.gn @@ -35,9 +35,12 @@ ohos_unittest("js_app_service_extension_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:app_service_extension", "${ability_runtime_native_path}/ability/native:insight_intent_executor", "${ability_runtime_native_path}/insight_intent/insight_intent_context:insightintentcontext", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] external_deps = [ diff --git a/test/unittest/js_auto_fill_extension_test/BUILD.gn b/test/unittest/js_auto_fill_extension_test/BUILD.gn index c264312cf8c..6c5da4b9612 100644 --- a/test/unittest/js_auto_fill_extension_test/BUILD.gn +++ b/test/unittest/js_auto_fill_extension_test/BUILD.gn @@ -34,6 +34,7 @@ ohos_unittest("js_auto_fill_extension_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] deps = [ "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:ui_extension", ] 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 977eb29d2bf..f0ca7432329 100644 --- a/test/unittest/js_photo_editor_extension_context_test/BUILD.gn +++ b/test/unittest/js_photo_editor_extension_context_test/BUILD.gn @@ -84,6 +84,7 @@ ohos_unittest("js_photo_editor_extension_context_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:photo_editor_extension", "${ability_runtime_native_path}/ability/native:ui_extension", 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 e2e9c578dbc..3e6209518e3 100644 --- a/test/unittest/js_photo_editor_extension_impl_test/BUILD.gn +++ b/test/unittest/js_photo_editor_extension_impl_test/BUILD.gn @@ -84,6 +84,7 @@ ohos_unittest("js_photo_editor_extension_impl_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:photo_editor_extension", "${ability_runtime_native_path}/ability/native:ui_extension", diff --git a/test/unittest/js_service_extension_test/BUILD.gn b/test/unittest/js_service_extension_test/BUILD.gn index 302689169e8..81ff993f8ba 100644 --- a/test/unittest/js_service_extension_test/BUILD.gn +++ b/test/unittest/js_service_extension_test/BUILD.gn @@ -35,8 +35,11 @@ ohos_unittest("js_service_extension_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:insight_intent_executor", "${ability_runtime_native_path}/insight_intent/insight_intent_context:insightintentcontext", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] external_deps = [ diff --git a/test/unittest/js_ui_ability_test/BUILD.gn b/test/unittest/js_ui_ability_test/BUILD.gn index f790f3d6569..94a64bd0ddd 100644 --- a/test/unittest/js_ui_ability_test/BUILD.gn +++ b/test/unittest/js_ui_ability_test/BUILD.gn @@ -42,6 +42,7 @@ ohos_unittest("js_ui_ability_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:configuration_helper", @@ -50,6 +51,7 @@ ohos_unittest("js_ui_ability_test") { "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_delegator", "${ability_runtime_path}/frameworks/native/ability/native:continuation_ipc", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_services_path}/common:event_report", ] diff --git a/test/unittest/js_ui_extension_content_session_test/BUILD.gn b/test/unittest/js_ui_extension_content_session_test/BUILD.gn index 58ecd96ce8f..e786e83a01a 100644 --- a/test/unittest/js_ui_extension_content_session_test/BUILD.gn +++ b/test/unittest/js_ui_extension_content_session_test/BUILD.gn @@ -40,6 +40,8 @@ ohos_unittest("js_ui_extension_content_session_test") { "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_napi_path}/inner/napi_wantagent_common:napi_wantagent_common", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:insight_intent_executor", "${ability_runtime_native_path}/ability/native:ui_extension", "${ability_runtime_native_path}/insight_intent/insight_intent_context:insightintentcontext", diff --git a/test/unittest/js_ui_extension_context_test/BUILD.gn b/test/unittest/js_ui_extension_context_test/BUILD.gn index 268c4039aff..c08011c599f 100644 --- a/test/unittest/js_ui_extension_context_test/BUILD.gn +++ b/test/unittest/js_ui_extension_context_test/BUILD.gn @@ -38,10 +38,14 @@ ohos_unittest("js_ui_extension_context_test") { configs = [] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:ui_extension", "${ability_runtime_native_path}/appkit:app_context", + "${ability_runtime_napi_path}/inner/napi_common:napi_common", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] external_deps = [ diff --git a/test/unittest/js_ui_service_extension_context_first_test/BUILD.gn b/test/unittest/js_ui_service_extension_context_first_test/BUILD.gn index 8f09f954ed9..4b383df1cac 100644 --- a/test/unittest/js_ui_service_extension_context_first_test/BUILD.gn +++ b/test/unittest/js_ui_service_extension_context_first_test/BUILD.gn @@ -37,17 +37,21 @@ ohos_unittest("js_ui_service_extension_context_first_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:service_extension", "${ability_runtime_native_path}/ability/native:ui_service_extension", "${ability_runtime_native_path}/ability/native:ui_service_extension_connection", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_napi_path}/inner/napi_common:napi_common", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -59,6 +63,7 @@ ohos_unittest("js_ui_service_extension_context_first_test") { "c_utils:utils", "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", diff --git a/test/unittest/js_ui_service_extension_context_second_test/BUILD.gn b/test/unittest/js_ui_service_extension_context_second_test/BUILD.gn index c8a31d616d4..9861b3acb00 100644 --- a/test/unittest/js_ui_service_extension_context_second_test/BUILD.gn +++ b/test/unittest/js_ui_service_extension_context_second_test/BUILD.gn @@ -34,17 +34,21 @@ ohos_unittest("js_ui_service_extension_context_second_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:service_extension", "${ability_runtime_native_path}/ability/native:ui_service_extension", "${ability_runtime_native_path}/ability/native:ui_service_extension_connection", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_napi_path}/inner/napi_common:napi_common", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -56,6 +60,7 @@ ohos_unittest("js_ui_service_extension_context_second_test") { "c_utils:utils", "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", diff --git a/test/unittest/js_ui_service_extension_test/BUILD.gn b/test/unittest/js_ui_service_extension_test/BUILD.gn index 160173b8e84..a8a0d8c9031 100644 --- a/test/unittest/js_ui_service_extension_test/BUILD.gn +++ b/test/unittest/js_ui_service_extension_test/BUILD.gn @@ -34,17 +34,21 @@ ohos_unittest("js_ui_service_extension_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", + "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:service_extension", "${ability_runtime_native_path}/ability/native:ui_service_extension", "${ability_runtime_native_path}/ability/native:ui_service_extension_connection", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] external_deps = [ @@ -55,6 +59,7 @@ ohos_unittest("js_ui_service_extension_test") { "ace_engine:ace_uicontent", "c_utils:utils", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", diff --git a/test/unittest/js_ui_service_host_proxy_test/BUILD.gn b/test/unittest/js_ui_service_host_proxy_test/BUILD.gn index 513af155ea3..e94b17befa0 100644 --- a/test/unittest/js_ui_service_host_proxy_test/BUILD.gn +++ b/test/unittest/js_ui_service_host_proxy_test/BUILD.gn @@ -45,6 +45,7 @@ ohos_unittest("js_ui_service_host_proxy_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", + "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", diff --git a/test/unittest/js_ui_service_proxy_test/BUILD.gn b/test/unittest/js_ui_service_proxy_test/BUILD.gn index b0d9b7c6659..a5edda242b8 100644 --- a/test/unittest/js_ui_service_proxy_test/BUILD.gn +++ b/test/unittest/js_ui_service_proxy_test/BUILD.gn @@ -40,17 +40,21 @@ ohos_unittest("js_ui_service_proxy_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", + "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:service_extension", "${ability_runtime_native_path}/ability/native:ui_service_extension", "${ability_runtime_native_path}/ability/native:ui_service_extension_connection", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] external_deps = [ @@ -61,6 +65,7 @@ ohos_unittest("js_ui_service_proxy_test") { "ace_engine:ace_uicontent", "c_utils:utils", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", diff --git a/test/unittest/mission_list_manager_ut_test/BUILD.gn b/test/unittest/mission_list_manager_ut_test/BUILD.gn index e1f8bc4e9e7..13e8749a747 100644 --- a/test/unittest/mission_list_manager_ut_test/BUILD.gn +++ b/test/unittest/mission_list_manager_ut_test/BUILD.gn @@ -39,6 +39,7 @@ ohos_unittest("mission_list_manager_ut_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -57,6 +58,7 @@ ohos_unittest("mission_list_manager_ut_test") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", @@ -68,6 +70,7 @@ ohos_unittest("mission_list_manager_ut_test") { "relational_store:native_dataability", "relational_store:native_rdb", "samgr:samgr_proxy", + "window_manager:sms", ] if (background_task_mgr_continuous_task_enable) { diff --git a/test/unittest/mission_list_test/BUILD.gn b/test/unittest/mission_list_test/BUILD.gn index 7c72f9189e3..1bf81d21c04 100644 --- a/test/unittest/mission_list_test/BUILD.gn +++ b/test/unittest/mission_list_test/BUILD.gn @@ -45,6 +45,7 @@ ohos_unittest("mission_list_test") { ] external_deps = [ + "ability_base:configuration", "ability_base:want", "ability_base:zuri", "access_token:libaccesstoken_sdk", @@ -90,6 +91,7 @@ ohos_unittest("mission_list_test_call") { ] external_deps = [ + "ability_base:configuration", "ability_base:want", "ability_base:zuri", "bundle_framework:appexecfwk_base", diff --git a/test/unittest/native_child_process_test/BUILD.gn b/test/unittest/native_child_process_test/BUILD.gn index eb3c4ee3b76..c1eede9045b 100644 --- a/test/unittest/native_child_process_test/BUILD.gn +++ b/test/unittest/native_child_process_test/BUILD.gn @@ -62,6 +62,8 @@ ohos_unittest("native_child_process_test") { "${ability_runtime_innerkits_path}/ability_manager:process_options", "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", diff --git a/test/unittest/photo_editor_extension_a_test/BUILD.gn b/test/unittest/photo_editor_extension_a_test/BUILD.gn index ec17657ea56..de2471e3db2 100644 --- a/test/unittest/photo_editor_extension_a_test/BUILD.gn +++ b/test/unittest/photo_editor_extension_a_test/BUILD.gn @@ -83,6 +83,7 @@ ohos_unittest("photo_editor_extension_a_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:photo_editor_extension", "${ability_runtime_native_path}/ability/native:ui_extension", "${ability_runtime_native_path}/appkit:app_context", diff --git a/test/unittest/photo_editor_extension_test/BUILD.gn b/test/unittest/photo_editor_extension_test/BUILD.gn index 5b7855ace25..abee89954c5 100644 --- a/test/unittest/photo_editor_extension_test/BUILD.gn +++ b/test/unittest/photo_editor_extension_test/BUILD.gn @@ -127,6 +127,8 @@ ohos_unittest("photo_editor_extension_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:photo_editor_extension", "${ability_runtime_native_path}/ability/native:ui_extension", "${ability_runtime_native_path}/appkit:app_context", diff --git a/test/unittest/service_extension_context_test/BUILD.gn b/test/unittest/service_extension_context_test/BUILD.gn index 6c412aa70cc..b104284a516 100644 --- a/test/unittest/service_extension_context_test/BUILD.gn +++ b/test/unittest/service_extension_context_test/BUILD.gn @@ -39,11 +39,14 @@ ohos_unittest("service_extension_context_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:service_extension", "${ability_runtime_native_path}/appkit:app_context", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", diff --git a/test/unittest/state_utils_test/BUILD.gn b/test/unittest/state_utils_test/BUILD.gn index 99bec30e48b..a49284ea5f5 100644 --- a/test/unittest/state_utils_test/BUILD.gn +++ b/test/unittest/state_utils_test/BUILD.gn @@ -34,6 +34,7 @@ ohos_unittest("state_utils_test") { deps = [] external_deps = [ + "ability_base:configuration", "ability_runtime:abilitykit_native", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/timeout_state_utils_test/BUILD.gn b/test/unittest/timeout_state_utils_test/BUILD.gn index 4b9f11b6477..f5400d75af1 100644 --- a/test/unittest/timeout_state_utils_test/BUILD.gn +++ b/test/unittest/timeout_state_utils_test/BUILD.gn @@ -37,10 +37,12 @@ ohos_unittest("timeout_state_utils_test") { deps = [] external_deps = [ + "ability_base:configuration", "ability_runtime:abilitykit_native", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", + "eventhandler:libeventhandler", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", diff --git a/test/unittest/ui_extension_ability_test/ui_extension_connect_test/BUILD.gn b/test/unittest/ui_extension_ability_test/ui_extension_connect_test/BUILD.gn index 47314242aa6..59f199a09e6 100644 --- a/test/unittest/ui_extension_ability_test/ui_extension_connect_test/BUILD.gn +++ b/test/unittest/ui_extension_ability_test/ui_extension_connect_test/BUILD.gn @@ -28,7 +28,7 @@ ohos_unittest("ui_extension_connect_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [] + deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub" ] external_deps = [ "ability_base:session_info", diff --git a/test/unittest/ui_extension_context_test/BUILD.gn b/test/unittest/ui_extension_context_test/BUILD.gn index b79abe1726a..3290f971de4 100644 --- a/test/unittest/ui_extension_context_test/BUILD.gn +++ b/test/unittest/ui_extension_context_test/BUILD.gn @@ -37,6 +37,8 @@ ohos_unittest("ui_extension_context_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:ui_extension", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", diff --git a/test/unittest/ui_service_extension_test/BUILD.gn b/test/unittest/ui_service_extension_test/BUILD.gn index 30e1d8d87ee..f8aa4c6f4cf 100644 --- a/test/unittest/ui_service_extension_test/BUILD.gn +++ b/test/unittest/ui_service_extension_test/BUILD.gn @@ -37,14 +37,17 @@ ohos_unittest("ui_service_extension_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:ui_service_extension", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_services_path}/abilitymgr:abilityms", ] diff --git a/test/unittest/ui_service_host_proxy_test/BUILD.gn b/test/unittest/ui_service_host_proxy_test/BUILD.gn index 486e7cfdff1..8730aaaafa6 100644 --- a/test/unittest/ui_service_host_proxy_test/BUILD.gn +++ b/test/unittest/ui_service_host_proxy_test/BUILD.gn @@ -40,17 +40,21 @@ ohos_unittest("ui_service_host_proxy_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", + "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:service_extension", "${ability_runtime_native_path}/ability/native:ui_service_extension", "${ability_runtime_native_path}/ability/native:ui_service_extension_connection", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] external_deps = [ @@ -61,6 +65,7 @@ ohos_unittest("ui_service_host_proxy_test") { "ace_engine:ace_uicontent", "c_utils:utils", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", diff --git a/test/unittest/ui_service_proxy_test/BUILD.gn b/test/unittest/ui_service_proxy_test/BUILD.gn index f6da8eeb56d..12fb8db8b78 100644 --- a/test/unittest/ui_service_proxy_test/BUILD.gn +++ b/test/unittest/ui_service_proxy_test/BUILD.gn @@ -40,17 +40,21 @@ ohos_unittest("ui_service_proxy_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", + "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:service_extension", "${ability_runtime_native_path}/ability/native:ui_service_extension", "${ability_runtime_native_path}/ability/native:ui_service_extension_connection", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] external_deps = [ @@ -61,6 +65,7 @@ ohos_unittest("ui_service_proxy_test") { "ace_engine:ace_uicontent", "c_utils:utils", "eventhandler:libeventhandler", + "form_fwk:fmskit_native", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", diff --git a/test/unittest/unlock_screen_test/BUILD.gn b/test/unittest/unlock_screen_test/BUILD.gn index 5032698033c..b23b92c02d8 100644 --- a/test/unittest/unlock_screen_test/BUILD.gn +++ b/test/unittest/unlock_screen_test/BUILD.gn @@ -43,6 +43,7 @@ ohos_unittest("unlock_screen_test") { ] external_deps = [ + "ability_base:configuration", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", -- Gitee