From 472454cb81c00aee2b5612b1a17955f57061c880 Mon Sep 17 00:00:00 2001 From: "zhangyafei.echo" Date: Fri, 17 Feb 2023 09:17:32 +0800 Subject: [PATCH] Description:Add extensionkit_native. Signed-off-by: zhangyafei.echo Change-Id: I2a50eeee3f0a923b74f3f4dd5eda2052ce59487f --- ability_runtime.gni | 2 + bundle.json | 27 ++- frameworks/js/napi/inner/napi_common/BUILD.gn | 6 +- frameworks/native/ability/native/BUILD.gn | 173 ++++++++++++++++-- frameworks/native/ability/native/ability.cpp | 14 +- .../native/ability/native/form_extension.cpp | 1 - .../ability/native/service_extension.cpp | 1 - .../native/static_subscriber_extension.cpp | 1 - frameworks/native/appkit/BUILD.gn | 3 +- .../kits/native/ability/native/ability.h | 6 - .../kits/native/ability/native/ability_impl.h | 1 - .../ability/native/form_js_event_handler.h | 1 + test/moduletest/ability_test/BUILD.gn | 4 + .../ability_service_extension_test/BUILD.gn | 1 + .../appkit/ohos_application_test/BUILD.gn | 1 + .../BUILD.gn | 15 ++ .../BUILD.gn | 6 + .../mission_list_manager_ut_test/BUILD.gn | 1 + 18 files changed, 226 insertions(+), 38 deletions(-) diff --git a/ability_runtime.gni b/ability_runtime.gni index bfbed72473..2f1a663f84 100644 --- a/ability_runtime.gni +++ b/ability_runtime.gni @@ -22,6 +22,7 @@ ability_runtime_test_path = "${ability_runtime_path}/test" ability_runtime_system_test_app_path = "${ability_runtime_path}/test/resource/amssystemtestability/abilitySrc" ace_engine_path = "//foundation/arkui/ace_engine" +arkui_path = "//foundation/arkui" bundlefwk_path = "//foundation/bundlemanager/bundle_framework" bundlefwk_inner_api_path = "${bundlefwk_path}/interfaces/inner_api" @@ -35,6 +36,7 @@ distributedschedule_path = "//foundation/systemabilitymgr" notification_path = "//base/notification" ans_core_path = "${notification_path}/distributed_notification_service/frameworks/core" +eventhandler_path = "//base/notification/eventhandler" distributeddatamgr_path = "//foundation/distributeddatamgr" form_fwk_napi_path = "${form_fwk_path}/frameworks/js/napi" ability_base_kits_path = "${ability_base_path}/interfaces/kits/native" diff --git a/bundle.json b/bundle.json index 78dd81b92f..79f0e4af49 100644 --- a/bundle.json +++ b/bundle.json @@ -82,6 +82,7 @@ "//foundation/ability/ability_runtime/services/sa_profile:ams_sa_profile", "//foundation/ability/ability_runtime/services/quickfixmgr:quick_fix.cfg", "//foundation/ability/ability_runtime/interfaces/inner_api:innerkits_target", + "//foundation/ability/ability_runtime/frameworks/native/ability/native:ability_thread", "//foundation/ability/ability_runtime/frameworks/native/ability/native:extension_module", "//foundation/ability/ability_runtime/frameworks/native/ability/native:static_subscriber_ipc", "//foundation/ability/ability_runtime/frameworks/js/napi:napi_packages", @@ -171,6 +172,18 @@ }, "name": "//foundation/ability/ability_runtime/interfaces/inner_api/napi_base_context:napi_base_context" }, + { + "header": { + "header_base": "//foundation/ability/ability_runtime/frameworks/js/napi/inner/napi_common", + "header_files": [ + "napi_common_configuration.h", + "napi_common_start_options.h", + "napi_common_util.h", + "napi_common_want.h" + ] + }, + "name": "//foundation/ability/ability_runtime/frameworks/js/napi/inner/napi_common:napi_common" + }, { "header": { "header_base": "//foundation/ability/ability_runtime/interfaces/inner_api/app_manager/include", @@ -210,6 +223,7 @@ "header": { "header_base": "//foundation/ability/ability_runtime/interfaces/kits/native/ability/native/", "header_files": [ + "service_extension.h" ] }, "name": "//foundation/ability/ability_runtime/frameworks/native/ability/native:service_extension" @@ -228,10 +242,17 @@ "header_files": [ "extension.h", "extension_base.h", - "service_extension.h", "extension_module_loader.h" ] }, + "name": "//foundation/ability/ability_runtime/frameworks/native/ability/native:extensionkit_native" + }, + { + "header": { + "header_base": "//foundation/ability/ability_runtime/interfaces/kits/native/ability/native/", + "header_files": [ + ] + }, "name": "//foundation/ability/ability_runtime/frameworks/native/ability/native:abilitykit_native" }, { @@ -253,9 +274,9 @@ }, { "header": { - "header_base": "//foundation/ability/ability_runtime/interfaces/kits/native/appkit/ability_runtime/", + "header_base": "//foundation/ability/ability_runtime/interfaces/kits/native/appkit/ability_runtime/context", "header_files": [ - "extension_context.h" + "application_context.h" ] }, "name": "//foundation/ability/ability_runtime/frameworks/native/appkit:app_context" diff --git a/frameworks/js/napi/inner/napi_common/BUILD.gn b/frameworks/js/napi/inner/napi_common/BUILD.gn index ad487d2892..c5be617f0c 100644 --- a/frameworks/js/napi/inner/napi_common/BUILD.gn +++ b/frameworks/js/napi/inner/napi_common/BUILD.gn @@ -24,7 +24,11 @@ ohos_shared_library("napi_common") { "//third_party/node/src", ] - public_configs = [ ":napi_common_public_config" ] + public_configs = [ + ":napi_common_public_config", + "${ability_runtime_native_path}/ability/native:ability_public_config", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits_public_config", + ] sources = [ "napi_common_ability.cpp", diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn index 3e8c3d7efe..8f35433378 100644 --- a/frameworks/native/ability/native/BUILD.gn +++ b/frameworks/native/ability/native/BUILD.gn @@ -85,7 +85,9 @@ config("ability_public_config") { "${form_fwk_path}/interfaces/kits/native/include", "${form_fwk_path}/interfaces/inner_api/include", "${windowmanager_path}/interfaces/innerkits/wm", + "${windowmanager_path}/interfaces/innerkits/dm", "${windowmanager_path}/interfaces/kits/napi/window_runtime/window_stage_napi", + "${windowmanager_path}/utils/include", ] defines = [ "SUPPORT_GRAPHICS" ] } @@ -113,16 +115,69 @@ ohos_shared_library("static_subscriber_ipc") { part_name = "ability_runtime" } -ohos_shared_library("ability_utils") { - include_dirs = - [ "${ability_runtime_path}/interfaces/kits/native/ability/native" ] +config("abilitykit_utils_public_config") { + visibility = [ ":*" ] + include_dirs = [ + "${ability_runtime_path}/interfaces/kits/native/ability/native/continuation/distributed", + "${ability_runtime_path}/interfaces/kits/native/ability/native/continuation/kits", + "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", + "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime", + "${ability_runtime_path}/interfaces/kits/native/appkit/app", + "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${bundlefwk_inner_api_path}/appexecfwk_base/include", + "${bundlefwk_inner_api_path}/appexecfwk_core/include/bundlemgr", + "//third_party/jsoncpp/include", + "//third_party/json/include", + ] - sources = - [ "${ability_runtime_native_path}/ability/native/ability_handler.cpp" ] + if (ability_runtime_graphics) { + include_dirs += [ + "${form_fwk_path}/interfaces/inner_api/include", + "${multimedia_path}/interfaces/innerkits/include", + "${windowmanager_path}/interfaces/innerkits/wm", + "${windowmanager_path}/interfaces/innerkits/dm", + "${windowmanager_path}/utils/include", + ] + defines = [ "SUPPORT_GRAPHICS" ] + } +} + +ohos_shared_library("abilitykit_utils") { + include_dirs = [ + "${ability_runtime_path}/interfaces/kits/native/ability/native", + "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app", + "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_innerkits_path}/wantagent/include", + "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_services_path}/common/include", + ] + + sources = [ + "${ability_runtime_native_path}/ability/native/ability_handler.cpp", + "${ability_runtime_native_path}/ability/native/ability_local_record.cpp", + "${ability_runtime_native_path}/ability/native/configuration_utils.cpp", + ] + + deps = [] + + if (ability_runtime_graphics) { + deps += [ "//third_party/icu/icu4c:shared_icuuc" ] + } + + public_configs = [ ":abilitykit_utils_public_config" ] external_deps = [ + "ability_base:configuration", + "ability_base:want", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "c_utils:utils", "eventhandler:libeventhandler", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "ipc:ipc_napi_common", + "napi:ace_napi", + "resource_management:global_resmgr", ] subsystem_name = "ability" @@ -152,14 +207,11 @@ ohos_shared_library("abilitykit_native") { "${ability_runtime_native_path}/ability/native/ability_lifecycle.cpp", "${ability_runtime_native_path}/ability/native/ability_lifecycle_executor.cpp", "${ability_runtime_native_path}/ability/native/ability_loader.cpp", - "${ability_runtime_native_path}/ability/native/ability_local_record.cpp", "${ability_runtime_native_path}/ability/native/ability_post_event_timeout.cpp", "${ability_runtime_native_path}/ability/native/ability_process.cpp", "${ability_runtime_native_path}/ability/native/ability_runtime/js_ability.cpp", "${ability_runtime_native_path}/ability/native/ability_runtime/js_ability_context.cpp", "${ability_runtime_native_path}/ability/native/ability_runtime/js_caller_complex.cpp", - "${ability_runtime_native_path}/ability/native/ability_thread.cpp", - "${ability_runtime_native_path}/ability/native/configuration_utils.cpp", "${ability_runtime_native_path}/ability/native/continuation/distributed/continuation_handler.cpp", "${ability_runtime_native_path}/ability/native/continuation/distributed/continuation_manager.cpp", "${ability_runtime_native_path}/ability/native/continuation/distributed/reverse_continuation_scheduler_primary.cpp", @@ -242,7 +294,7 @@ ohos_shared_library("abilitykit_native") { } public_deps = [ - ":ability_utils", + ":abilitykit_utils", "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", "//base/startup/init/interfaces/innerkits:libbegetutil", "//foundation/arkui/napi:ace_napi", @@ -280,6 +332,101 @@ ohos_shared_library("abilitykit_native") { part_name = "ability_runtime" } +config("extensionkit_public_config") { + visibility = [ ":*" ] + include_dirs = [ + "${ability_runtime_path}/interfaces/kits/native/ability/native/continuation/distributed", + "${ability_runtime_path}/interfaces/kits/native/ability/native/continuation/kits", + "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", + "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime", + "${ability_runtime_path}/interfaces/kits/native/appkit/app", + "${ability_runtime_innerkits_path}/app_manager/include/appmgr", + "${bundlefwk_inner_api_path}/appexecfwk_base/include", + "${bundlefwk_inner_api_path}/appexecfwk_core/include/bundlemgr", + "//third_party/jsoncpp/include", + "//third_party/json/include", + ] + + if (ability_runtime_graphics) { + include_dirs += [ + "${form_fwk_path}/interfaces/inner_api/include", + "${multimedia_path}/interfaces/innerkits/include", + "${windowmanager_path}/interfaces/innerkits/wm", + "${windowmanager_path}/interfaces/innerkits/dm", + "${windowmanager_path}/utils/include", + ] + defines = [ "SUPPORT_GRAPHICS" ] + } +} + +ohos_shared_library("extensionkit_native") { + include_dirs = [ + "${ability_runtime_path}/interfaces/kits/native/ability/native", + "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime", + "${ability_runtime_napi_path}/inner/napi_common", + ] + + sources = [ + "${ability_runtime_native_path}/ability/native/extension.cpp", + "${ability_runtime_native_path}/ability/native/extension_config_mgr.cpp", + "${ability_runtime_native_path}/ability/native/extension_impl.cpp", + "${ability_runtime_native_path}/ability/native/extension_module_loader.cpp", + "${ability_runtime_native_path}/ability/native/js_extension_common.cpp", + "${ability_runtime_native_path}/appkit/ability_runtime/extension_context.cpp", + ] + + public_configs = [ ":extensionkit_public_config" ] + + external_deps = [ + "ability_base:want", + "ability_runtime:ability_context_native", + "ability_runtime:ability_manager", + "ability_runtime:napi_common", + "ability_runtime:runtime", + "c_utils:utils", + "hitrace_native:hitrace_meter", + "hiviewdfx_hilog_native:libhilog", + ] + + public_deps = [ + ":abilitykit_utils", + "${arkui_path}/napi:ace_napi", + "${eventhandler_path}/frameworks/eventhandler:libeventhandler", + ] + + subsystem_name = "ability" + part_name = "ability_runtime" +} + +ohos_shared_library("ability_thread") { + include_dirs = + [ "${ability_runtime_path}/interfaces/kits/native/ability/native" ] + + sources = + [ "${ability_runtime_native_path}/ability/native/ability_thread.cpp" ] + + deps = [ + ":abilitykit_native", + "${ability_runtime_innerkits_path}/dataobs_manager:dataobs_manager", + "${ability_runtime_native_path}/appkit:app_context", + ] + + external_deps = [ + "ability_base:configuration", + "ability_base:want", + "ability_base:zuri", + "ability_runtime:ability_context_native", + "ability_runtime:ability_manager", + "c_utils:utils", + "hitrace_native:hitrace_meter", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + ] + + subsystem_name = "ability" + part_name = "ability_runtime" +} + ohos_shared_library("form_extension") { if (ability_runtime_graphics) { include_dirs = [ @@ -370,10 +517,12 @@ ohos_shared_library("service_extension") { "ability_runtime:ability_manager", "ability_runtime:runtime", "c_utils:utils", + "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "ipc:ipc_napi_common", + "napi:ace_napi", ] subsystem_name = "ability" @@ -395,7 +544,7 @@ ohos_shared_library("static_subscriber_extension") { ] deps = [ - ":abilitykit_native", + ":extensionkit_native", ":static_subscriber_ipc", "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/appkit:app_context", @@ -407,8 +556,10 @@ ohos_shared_library("static_subscriber_extension") { "ability_runtime:runtime", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "napi:ace_napi", ] subsystem_name = "ability" @@ -465,7 +616,7 @@ ohos_shared_library("continuation_ipc") { public_configs = [ ":ability_public_config" ] - deps = [ ":ability_utils" ] + deps = [ ":abilitykit_utils" ] external_deps = [ "ability_base:want", diff --git a/frameworks/native/ability/native/ability.cpp b/frameworks/native/ability/native/ability.cpp index 4aa16de615..29173d6aa2 100644 --- a/frameworks/native/ability/native/ability.cpp +++ b/frameworks/native/ability/native/ability.cpp @@ -18,17 +18,13 @@ #include #include -#include "ability_impl.h" -#include "ability_loader.h" #include "ability_post_event_timeout.h" #include "ability_recovery.h" #include "ability_runtime/js_ability.h" #include "abs_shared_result_set.h" #include "app_recovery.h" -#include "hitrace_meter.h" #include "configuration_convertor.h" #include "connection_manager.h" -#include "context_impl.h" #include "continuation_manager.h" #include "continuation_register_manager.h" #include "continuation_register_manager_proxy.h" @@ -36,20 +32,19 @@ #include "data_ability_predicates.h" #include "data_ability_result.h" #include "data_uri_utils.h" +#include "event_report.h" #include "hilog_wrapper.h" +#include "hitrace_meter.h" #include "if_system_ability_manager.h" -#include "ipc_skeleton.h" #include "iservice_registry.h" #include "ohos_application.h" #include "reverse_continuation_scheduler_primary.h" #include "reverse_continuation_scheduler_replica.h" #include "reverse_continuation_scheduler_replica_handler_interface.h" #include "runtime.h" -#include "string_wrapper.h" #include "system_ability_definition.h" #include "task_handler_client.h" #include "values_bucket.h" -#include "event_report.h" #ifdef BGTASKMGR_CONTINUOUS_TASK_ENABLE #include "background_task_mgr_helper.h" @@ -58,16 +53,12 @@ #ifdef SUPPORT_GRAPHICS #include "display_type.h" -#include "form_host_client.h" -#include "form_mgr.h" -#include "form_mgr_errors.h" #include "form_provider_client.h" #include "key_event.h" #endif namespace OHOS { namespace AppExecFwk { -// REGISTER_AA(Ability) const std::string Ability::SYSTEM_UI("com.ohos.systemui"); const std::string Ability::STATUS_BAR("com.ohos.systemui.statusbar.MainAbility"); const std::string Ability::NAVIGATION_BAR("com.ohos.systemui.navigationbar.MainAbility"); @@ -77,7 +68,6 @@ const std::string DEVICE_MANAGER_NAME = "com.ohos.devicemanagerui.MainAbility"; const std::string Ability::DMS_SESSION_ID("sessionId"); const std::string Ability::DMS_ORIGIN_DEVICE_ID("deviceId"); const int Ability::DEFAULT_DMS_SESSION_ID(0); -const std::string PERMISSION_REQUIRE_FORM = "ohos.permission.REQUIRE_FORM"; const std::string LAUNCHER_BUNDLE_NAME = "com.ohos.launcher"; const std::string LAUNCHER_ABILITY_NAME = "com.ohos.launcher.MainAbility"; const std::string SHOW_ON_LOCK_SCREEN = "ShowOnLockScreen"; diff --git a/frameworks/native/ability/native/form_extension.cpp b/frameworks/native/ability/native/form_extension.cpp index 72c866fc0f..b81395ace2 100644 --- a/frameworks/native/ability/native/form_extension.cpp +++ b/frameworks/native/ability/native/form_extension.cpp @@ -15,7 +15,6 @@ #include "form_extension.h" -#include "ability_loader.h" #include "configuration_utils.h" #include "form_extension_context.h" #include "form_runtime/js_form_extension.h" diff --git a/frameworks/native/ability/native/service_extension.cpp b/frameworks/native/ability/native/service_extension.cpp index 6e3a805263..cb30734f2e 100644 --- a/frameworks/native/ability/native/service_extension.cpp +++ b/frameworks/native/ability/native/service_extension.cpp @@ -15,7 +15,6 @@ #include "service_extension.h" -#include "ability_loader.h" #include "configuration_utils.h" #include "connection_manager.h" #include "hilog_wrapper.h" diff --git a/frameworks/native/ability/native/static_subscriber_extension.cpp b/frameworks/native/ability/native/static_subscriber_extension.cpp index d0588f1fd5..9e2cec9906 100644 --- a/frameworks/native/ability/native/static_subscriber_extension.cpp +++ b/frameworks/native/ability/native/static_subscriber_extension.cpp @@ -15,7 +15,6 @@ #include "static_subscriber_extension.h" -#include "ability_loader.h" #include "hilog_wrapper.h" #include "js_static_subscriber_extension.h" #include "runtime.h" diff --git a/frameworks/native/appkit/BUILD.gn b/frameworks/native/appkit/BUILD.gn index a7ed180e92..db29007e5f 100644 --- a/frameworks/native/appkit/BUILD.gn +++ b/frameworks/native/appkit/BUILD.gn @@ -62,6 +62,7 @@ config("appkit_public_config") { include_dirs = [ "${ability_base_kits_path}/configuration/include", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_delegator", + "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app", "${global_path}/resource_management/interfaces/inner_api/include", ] @@ -80,7 +81,6 @@ ohos_shared_library("appkit_native") { include_dirs = [ "native", "${ability_runtime_path}/interfaces/kits/native/appkit", - "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", "${ability_runtime_path}/interfaces/kits/native/appkit/app", "${ability_runtime_path}/interfaces/kits/native/appkit/app/task", @@ -122,6 +122,7 @@ ohos_shared_library("appkit_native") { deps = [ ":appkit_delegator", "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr", + "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:app_context_utils", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", diff --git a/interfaces/kits/native/ability/native/ability.h b/interfaces/kits/native/ability/native/ability.h index 93fdc8f08b..14c1dd12c3 100644 --- a/interfaces/kits/native/ability/native/ability.h +++ b/interfaces/kits/native/ability/native/ability.h @@ -31,8 +31,6 @@ #include "context.h" #include "continuation_handler.h" #include "continuation_state.h" -#include "dummy_ability_package.h" -#include "dummy_component_container.h" #include "dummy_notification_request.h" #include "iability_callback.h" #include "iremote_object.h" @@ -44,10 +42,7 @@ #ifdef SUPPORT_GRAPHICS #include "ability_window.h" #include "display_manager.h" -#include "form_callback_interface.h" #include "form_constants.h" -#include "form_death_callback.h" -#include "form_info.h" #include "form_provider_info.h" #include "form_state_info.h" #include "foundation/multimodalinput/input/interfaces/native/innerkits/event/include/key_event.h" @@ -55,7 +50,6 @@ #include "window_option.h" #include "window_scene.h" #include "wm_common.h" -#include "inttypes.h" #endif namespace OHOS { diff --git a/interfaces/kits/native/ability/native/ability_impl.h b/interfaces/kits/native/ability/native/ability_impl.h index c4030a0dd2..f4971a1465 100644 --- a/interfaces/kits/native/ability/native/ability_impl.h +++ b/interfaces/kits/native/ability/native/ability_impl.h @@ -24,7 +24,6 @@ #include "ability_handler.h" #include "ability_manager_client.h" #include "ability_manager_interface.h" -#include "dummy_component_container.h" #ifdef SUPPORT_GRAPHICS #include "foundation/multimodalinput/input/interfaces/native/innerkits/event/include/i_input_event_consumer.h" #endif diff --git a/interfaces/kits/native/ability/native/form_js_event_handler.h b/interfaces/kits/native/ability/native/form_js_event_handler.h index adf0fdd4ac..47f98b557b 100644 --- a/interfaces/kits/native/ability/native/form_js_event_handler.h +++ b/interfaces/kits/native/ability/native/form_js_event_handler.h @@ -19,6 +19,7 @@ #include #include "ability.h" #include "event_handler.h" +#include "form_js_info.h" namespace OHOS { namespace AppExecFwk { diff --git a/test/moduletest/ability_test/BUILD.gn b/test/moduletest/ability_test/BUILD.gn index d82f18bd7b..62be81c836 100644 --- a/test/moduletest/ability_test/BUILD.gn +++ b/test/moduletest/ability_test/BUILD.gn @@ -58,6 +58,7 @@ ohos_moduletest("ability_moduletest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${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_services_path}/abilitymgr:abilityms", @@ -109,6 +110,7 @@ ohos_moduletest("ability_conetxt_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${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_services_path}/abilitymgr:abilityms", @@ -146,6 +148,7 @@ ohos_moduletest("ability_thread_call_request_module_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${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}/appkit:appkit_native", @@ -236,6 +239,7 @@ ohos_moduletest("data_ability_helper_module_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:data_ability_helper", "${ability_runtime_native_path}/appkit:appkit_native", diff --git a/test/unittest/ability_service_extension_test/BUILD.gn b/test/unittest/ability_service_extension_test/BUILD.gn index 4325b68b9e..8007183659 100644 --- a/test/unittest/ability_service_extension_test/BUILD.gn +++ b/test/unittest/ability_service_extension_test/BUILD.gn @@ -41,6 +41,7 @@ ohos_unittest("ability_service_extension_test") { } deps = [ + "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:service_extension", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", diff --git a/test/unittest/appkit/ohos_application_test/BUILD.gn b/test/unittest/appkit/ohos_application_test/BUILD.gn index 5ec0d8e715..732ae75d10 100644 --- a/test/unittest/appkit/ohos_application_test/BUILD.gn +++ b/test/unittest/appkit/ohos_application_test/BUILD.gn @@ -48,6 +48,7 @@ ohos_unittest("ohos_application_test") { } deps = [ + "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", "../../../../frameworks/native/ability/native:abilitykit_native", diff --git a/test/unittest/frameworks_kits_ability_native_test/BUILD.gn b/test/unittest/frameworks_kits_ability_native_test/BUILD.gn index 300c9f9074..04210d33d5 100644 --- a/test/unittest/frameworks_kits_ability_native_test/BUILD.gn +++ b/test/unittest/frameworks_kits_ability_native_test/BUILD.gn @@ -93,6 +93,7 @@ ohos_unittest("ability_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -307,6 +308,7 @@ ohos_unittest("service_ability_impl_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${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}/appkit:appkit_native", @@ -379,6 +381,7 @@ ohos_unittest("data_ability_helper_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:data_ability_helper", "${ability_runtime_native_path}/appkit:app_context", @@ -552,6 +555,7 @@ ohos_unittest("ability_impl_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${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}/appkit:appkit_native", @@ -614,6 +618,7 @@ ohos_unittest("ability_thread_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${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}/appkit:appkit_native", @@ -831,6 +836,7 @@ ohos_unittest("ability_thread_call_request_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -958,6 +964,7 @@ ohos_unittest("data_ability_impl_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${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}/appkit:appkit_native", @@ -1017,6 +1024,7 @@ ohos_unittest("data_ability_impl_file_secondpart_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${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}/appkit:appkit_native", @@ -1064,6 +1072,7 @@ ohos_unittest("data_ability_impl_file_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${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}/appkit:appkit_native", @@ -1113,6 +1122,7 @@ ohos_unittest("ability_thread_dataability_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${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}/appkit:appkit_native", @@ -1424,6 +1434,7 @@ ohos_unittest("form_host_client_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -1465,6 +1476,7 @@ ohos_unittest("continuation_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${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}/appkit:appkit_native", @@ -1671,6 +1683,7 @@ ohos_unittest("ability_window_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -1719,6 +1732,7 @@ ohos_unittest("ability_handler_test") { configs = [ ":module_private_config" ] deps = [ + "${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}/appkit:app_context_utils", @@ -1753,6 +1767,7 @@ ohos_unittest("ability_impl_factory_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/dataobs_manager:dataobs_manager", "${ability_runtime_native_path}/ability/native:ability_business_error", + "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:continuation_ipc", "${ability_runtime_native_path}/appkit:app_context", diff --git a/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn b/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn index ec137ac028..0320bce823 100644 --- a/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn +++ b/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn @@ -107,6 +107,7 @@ ohos_unittest("application_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${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}/appkit:appkit_native", @@ -142,6 +143,7 @@ ohos_unittest("context_container_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${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}/appkit:appkit_native", @@ -182,6 +184,7 @@ ohos_unittest("context_deal_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${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}/appkit:appkit_native", @@ -224,6 +227,7 @@ ohos_unittest("application_impl_test") { "${ABILITY_INNERKITS_PATH}/uri_permission:uri_permission_mgr", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${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}/appkit:appkit_native", @@ -360,6 +364,7 @@ ohos_unittest("ability_stage_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${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}/appkit:appkit_native", @@ -393,6 +398,7 @@ ohos_unittest("form_extension_context_test") { configs = [ ":module_context_config" ] deps = [ + "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:form_extension", "${ability_runtime_native_path}/appkit:app_context", diff --git a/test/unittest/mission_list_manager_ut_test/BUILD.gn b/test/unittest/mission_list_manager_ut_test/BUILD.gn index d2f2b0c9da..c7b50d48a2 100644 --- a/test/unittest/mission_list_manager_ut_test/BUILD.gn +++ b/test/unittest/mission_list_manager_ut_test/BUILD.gn @@ -37,6 +37,7 @@ ohos_unittest("mission_list_manager_ut_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification",