From d414a75c99acc305e9f46da14c2bb66c98c3b882 Mon Sep 17 00:00:00 2001 From: Luobniz21 Date: Sat, 13 Jun 2026 17:20:44 +0800 Subject: [PATCH] 0613_abilitykit Signed-off-by: Luobniz21 --- frameworks/ets/ani/ability_manager/BUILD.gn | 1 + frameworks/ets/ani/ani_common/BUILD.gn | 1 + frameworks/native/ability/native/BUILD.gn | 63 +++++++++++++++++-- services/abilitymgr/BUILD.gn | 3 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../ams_mgr_kill_process_test/BUILD.gn | 2 +- .../child_process_manager_test/BUILD.gn | 2 +- test/unittest/cj_test_runner_test/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- test/unittest/sys_mgr_client_test/BUILD.gn | 2 +- 17 files changed, 74 insertions(+), 20 deletions(-) diff --git a/frameworks/ets/ani/ability_manager/BUILD.gn b/frameworks/ets/ani/ability_manager/BUILD.gn index 8ca078106e..91b0fd4250 100644 --- a/frameworks/ets/ani/ability_manager/BUILD.gn +++ b/frameworks/ets/ani/ability_manager/BUILD.gn @@ -61,6 +61,7 @@ ohos_shared_library("ability_manager_ani_kit") { "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:ability_business_error", + "${ability_runtime_native_path}/ability/native:ability_observer_ipc", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_path}/frameworks/ets/ani/ani_common:ani_common", diff --git a/frameworks/ets/ani/ani_common/BUILD.gn b/frameworks/ets/ani/ani_common/BUILD.gn index d5757184a4..455e08b2d2 100644 --- a/frameworks/ets/ani/ani_common/BUILD.gn +++ b/frameworks/ets/ani/ani_common/BUILD.gn @@ -99,6 +99,7 @@ ohos_shared_library("ani_common") { "${ability_runtime_innerkits_path}/error_utils:ability_runtime_error_util", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability/native:ability_business_error", + "${ability_runtime_native_path}/ability/native:ability_observer_ipc", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:application_context_manager", diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn index 5d7a830bf5..4b2e0fc7e0 100644 --- a/frameworks/native/ability/native/BUILD.gn +++ b/frameworks/native/ability/native/BUILD.gn @@ -324,23 +324,17 @@ ohos_shared_library("abilitykit_native") { "${ability_runtime_native_path}/ability/native/data_ability_helper_impl.cpp", "${ability_runtime_native_path}/ability/native/data_ability_impl.cpp", "${ability_runtime_native_path}/ability/native/data_uri_utils.cpp", - "${ability_runtime_native_path}/ability/native/distributed_ability_runtime/distributed_client.cpp", - "${ability_runtime_native_path}/ability/native/free_install_observer_proxy.cpp", - "${ability_runtime_native_path}/ability/native/free_install_observer_stub.cpp", "${ability_runtime_native_path}/ability/native/insight_intent_host_client.cpp", "${ability_runtime_native_path}/ability/native/js_deferred_callback.cpp", "${ability_runtime_native_path}/ability/native/js_free_install_observer.cpp", "${ability_runtime_native_path}/ability/native/js_query_erms_observer.cpp", "${ability_runtime_native_path}/ability/native/js_start_abilities_observer.cpp", "${ability_runtime_native_path}/ability/native/preload_ui_extension_host_client.cpp", - "${ability_runtime_native_path}/ability/native/query_erms_observer_proxy.cpp", - "${ability_runtime_native_path}/ability/native/query_erms_observer_stub.cpp", "${ability_runtime_native_path}/ability/native/service_ability_impl.cpp", "${ability_runtime_native_path}/ability/native/start_abilities_observer.cpp", "${ability_runtime_native_path}/appkit/app/app_context.cpp", "${ability_runtime_native_path}/appkit/app/context_container.cpp", "${ability_runtime_native_path}/appkit/app/context_deal.cpp", - "${ability_runtime_native_path}/appkit/app/sys_mgr_client.cpp", "${ability_runtime_services_path}/abilitymgr/src/launch_param.cpp", ] configs = [ @@ -354,6 +348,7 @@ ohos_shared_library("abilitykit_native") { ] deps = [ + ":ability_observer_ipc", ":abilitykit_utils", ":configuration_helper", ":continuation_ipc", @@ -496,6 +491,61 @@ ohos_shared_library("abilitykit_native") { part_name = "ability_runtime" } +ohos_shared_library("ability_observer_ipc") { + branch_protector_ret = "pac_ret" + sanitize = { + cfi = true + cfi_cross_dso = true + cfi_vcall_icall_only = true + debug = false + } + + include_dirs = [ + "${ability_runtime_path}/interfaces/inner_api/runtime/include", + "${ability_runtime_path}/interfaces/kits/native/ability/native", + "${ability_runtime_path}/interfaces/kits/native/ability/native/ability_runtime", + "${ability_runtime_innerkits_path}/ability_manager/include", + "${ability_runtime_services_path}/abilitymgr/include/utils", + "${ability_runtime_napi_path}/inner/napi_ability_common", + "${ability_runtime_path}/interfaces/kits/native/ability/native/ability_business_error", + ] + + sources = [ + "${ability_runtime_native_path}/ability/native/free_install_observer_proxy.cpp", + "${ability_runtime_native_path}/ability/native/free_install_observer_stub.cpp", + "${ability_runtime_native_path}/ability/native/query_erms_observer_proxy.cpp", + "${ability_runtime_native_path}/ability/native/query_erms_observer_stub.cpp", + "${ability_runtime_native_path}/ability/native/distributed_ability_runtime/distributed_client.cpp", + "${ability_runtime_native_path}/appkit/app/sys_mgr_client.cpp", + ] + + configs = [ + ":ability_config", + "${ability_runtime_services_path}/common:optimize_config", + ] + + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_path}/utils/global/common:runtime_utils", + "${ability_runtime_native_path}/ability/native:ability_business_error", + ] + + external_deps = [ + "ability_base:want", + "c_utils:utils", + "hilog:libhilog", + "hitrace:hitrace_meter", + "ipc:ipc_core", + "napi:ace_napi", + "samgr:samgr_proxy", + ] + + subsystem_name = "ability" + innerapi_tags = [ "platformsdk" ] + part_name = "ability_runtime" +} + ohos_shared_library("cj_abilitykit_native_ffi") { sanitize = { integer_overflow = true @@ -1095,6 +1145,7 @@ ohos_shared_library("uiabilitykit_native") { configs = [ "${ability_runtime_services_path}/common:optimize_config" ] deps = [ + ":ability_observer_ipc", ":abilitykit_native", ":abilitykit_utils", ":configuration_helper", diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index cebcdd6566..76591f14d2 100644 --- a/services/abilitymgr/BUILD.gn +++ b/services/abilitymgr/BUILD.gn @@ -64,6 +64,7 @@ config("abilityms_config") { "//prebuilts/jdk/jdk8/linux-x86/include/linux", "${ability_runtime_path}/interfaces/kits/native/ability/native", "${ability_runtime_innerkits_path}/dataobs_manager/include", + "${ability_runtime_path}/interfaces/kits/native/ability/native/distributed_ability_runtime", "${ability_runtime_path}/tools/aa/include", "${ability_runtime_innerkits_path}/wantagent/include", "${ability_runtime_innerkits_path}/session_handler/include", @@ -155,7 +156,7 @@ ohos_shared_library("abilityms") { "${ability_runtime_innerkits_path}/foreground_app_obs_manager:foreground_app_obs_manager", "${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:ability_observer_ipc", "${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/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn index 4fad7ebfb9..9132b4472f 100644 --- a/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn @@ -61,7 +61,7 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteManagerFuzzTest") { "${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_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:ability_observer_ipc", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", diff --git a/test/unittest/ability_manager_service_first_test/BUILD.gn b/test/unittest/ability_manager_service_first_test/BUILD.gn index ea1581bc75..84581adeb2 100644 --- a/test/unittest/ability_manager_service_first_test/BUILD.gn +++ b/test/unittest/ability_manager_service_first_test/BUILD.gn @@ -79,7 +79,7 @@ ohos_unittest("ability_manager_service_first_test") { "${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:ability_observer_ipc", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/global/common:runtime_utils", diff --git a/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn b/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn index 8f648c03d5..7dcc4c983a 100644 --- a/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn @@ -272,7 +272,7 @@ ohos_unittest("ability_manager_service_fourteenth_test") { "${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:ability_observer_ipc", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/global/common:runtime_utils", diff --git a/test/unittest/ability_manager_service_second_test/BUILD.gn b/test/unittest/ability_manager_service_second_test/BUILD.gn index a7a75de15f..4d86584122 100644 --- a/test/unittest/ability_manager_service_second_test/BUILD.gn +++ b/test/unittest/ability_manager_service_second_test/BUILD.gn @@ -274,7 +274,7 @@ ohos_unittest("ability_manager_service_second_test") { "${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:ability_observer_ipc", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/global/common:runtime_utils", diff --git a/test/unittest/ability_manager_service_sixth_test/BUILD.gn b/test/unittest/ability_manager_service_sixth_test/BUILD.gn index 336f720135..c94d810eb2 100644 --- a/test/unittest/ability_manager_service_sixth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_sixth_test/BUILD.gn @@ -91,7 +91,7 @@ ohos_unittest("ability_manager_service_sixth_test") { "${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:ability_observer_ipc", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/global/common:runtime_utils", diff --git a/test/unittest/ability_manager_service_third_test/BUILD.gn b/test/unittest/ability_manager_service_third_test/BUILD.gn index 2dcc7ac994..b544950966 100644 --- a/test/unittest/ability_manager_service_third_test/BUILD.gn +++ b/test/unittest/ability_manager_service_third_test/BUILD.gn @@ -86,7 +86,7 @@ ohos_unittest("ability_manager_service_third_test") { "${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:ability_observer_ipc", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/global/common:runtime_utils", diff --git a/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn b/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn index 7501c02c5e..c92006c41e 100644 --- a/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn @@ -276,7 +276,7 @@ ohos_unittest("ability_manager_service_thirteenth_test") { "${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:ability_observer_ipc", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/global/common:runtime_utils", diff --git a/test/unittest/ams_mgr_kill_process_test/BUILD.gn b/test/unittest/ams_mgr_kill_process_test/BUILD.gn index 13f80b2f87..23b403402a 100644 --- a/test/unittest/ams_mgr_kill_process_test/BUILD.gn +++ b/test/unittest/ams_mgr_kill_process_test/BUILD.gn @@ -53,7 +53,7 @@ ohos_unittest("AmsMgrKillProcessTest") { deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", - "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:ability_observer_ipc", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:perm_verification", diff --git a/test/unittest/child_process_manager_test/BUILD.gn b/test/unittest/child_process_manager_test/BUILD.gn index ffeda5f8e6..20d2dad608 100644 --- a/test/unittest/child_process_manager_test/BUILD.gn +++ b/test/unittest/child_process_manager_test/BUILD.gn @@ -44,7 +44,7 @@ ohos_unittest("child_process_manager_test") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${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:ability_observer_ipc", "${ability_runtime_path}/interfaces/inner_api/child_process_manager:child_process_manager", "${ability_runtime_services_path}/common:app_util_static", ] diff --git a/test/unittest/cj_test_runner_test/BUILD.gn b/test/unittest/cj_test_runner_test/BUILD.gn index d8ea28d397..60dfc030cd 100644 --- a/test/unittest/cj_test_runner_test/BUILD.gn +++ b/test/unittest/cj_test_runner_test/BUILD.gn @@ -64,7 +64,7 @@ ohos_unittest("cj_test_runner_test") { "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${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}/ability/native:ability_observer_ipc", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_delegator", diff --git a/test/unittest/insight_intent/insight_intent_execute_manager_second_test/BUILD.gn b/test/unittest/insight_intent/insight_intent_execute_manager_second_test/BUILD.gn index edd41d6c68..d2028571ef 100644 --- a/test/unittest/insight_intent/insight_intent_execute_manager_second_test/BUILD.gn +++ b/test/unittest/insight_intent/insight_intent_execute_manager_second_test/BUILD.gn @@ -52,7 +52,7 @@ ohos_unittest("insight_intent_execute_manager_second_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", - "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:ability_observer_ipc", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", diff --git a/test/unittest/insight_intent/insight_intent_execute_manager_test/BUILD.gn b/test/unittest/insight_intent/insight_intent_execute_manager_test/BUILD.gn index 3865734036..87338f9d97 100644 --- a/test/unittest/insight_intent/insight_intent_execute_manager_test/BUILD.gn +++ b/test/unittest/insight_intent/insight_intent_execute_manager_test/BUILD.gn @@ -44,7 +44,7 @@ ohos_unittest("insight_intent_execute_manager_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", - "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:ability_observer_ipc", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", diff --git a/test/unittest/sys_mgr_client_test/BUILD.gn b/test/unittest/sys_mgr_client_test/BUILD.gn index fd66e50ad8..20230355fc 100644 --- a/test/unittest/sys_mgr_client_test/BUILD.gn +++ b/test/unittest/sys_mgr_client_test/BUILD.gn @@ -39,7 +39,7 @@ ohos_unittest("sys_mgr_client_test") { deps = [ "${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:ability_observer_ipc", "${ability_runtime_services_path}/abilitymgr:abilityms", ]