diff --git a/ets_environment/test/unittest/ets_environment_test/BUILD.gn b/ets_environment/test/unittest/ets_environment_test/BUILD.gn index b3c8cb95b6..eab2fcc2ca 100644 --- a/ets_environment/test/unittest/ets_environment_test/BUILD.gn +++ b/ets_environment/test/unittest/ets_environment_test/BUILD.gn @@ -34,11 +34,11 @@ template("ets_environment_test_template") { deps = [ "${ability_runtime_innerkits_path}/connect_server_manager:connect_server_manager", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_path}/ets_environment/frameworks/ets_environment:ets_environment", ] external_deps = [ - "ability_runtime:runtime", - "ability_runtime:ets_environment", "c_utils:utils", "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", diff --git a/js_environment/test/unittest/js_environment_test/BUILD.gn b/js_environment/test/unittest/js_environment_test/BUILD.gn index 419b6c5972..c2a7b09888 100644 --- a/js_environment/test/unittest/js_environment_test/BUILD.gn +++ b/js_environment/test/unittest/js_environment_test/BUILD.gn @@ -26,11 +26,12 @@ template("js_environment_test_template") { configs = [] - deps = [] + deps = [ + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment", + ] external_deps = [ - "ability_runtime:js_environment", - "ability_runtime:runtime", "c_utils:utils", "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", diff --git a/js_environment/test/unittest/uncaught_exception_callback_test/BUILD.gn b/js_environment/test/unittest/uncaught_exception_callback_test/BUILD.gn index df8aa7c30b..271965bf00 100644 --- a/js_environment/test/unittest/uncaught_exception_callback_test/BUILD.gn +++ b/js_environment/test/unittest/uncaught_exception_callback_test/BUILD.gn @@ -20,9 +20,12 @@ ohos_unittest("uncaught_exception_callback_test") { module_out_path = module_output_path sources = [ "uncaught_exception_callback_test.cpp" ] + deps = [ + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment", + ] + external_deps = [ - "ability_runtime:js_environment", - "ability_runtime:runtime", "c_utils:utils", "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", diff --git a/service_router_framework/services/srms/test/unittest/service_router_mgr_interface_test/BUILD.gn b/service_router_framework/services/srms/test/unittest/service_router_mgr_interface_test/BUILD.gn index bd5644db82..e15b9200b1 100755 --- a/service_router_framework/services/srms/test/unittest/service_router_mgr_interface_test/BUILD.gn +++ b/service_router_framework/services/srms/test/unittest/service_router_mgr_interface_test/BUILD.gn @@ -29,6 +29,7 @@ ohos_unittest("ServiceRouterMgrInterfaceTest") { ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${srms_inner_api_path}:service_router_mgr_proxy", "${srms_inner_api_path}:srms_fwk", @@ -37,7 +38,6 @@ ohos_unittest("ServiceRouterMgrInterfaceTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", diff --git a/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn b/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn index b57b13ab0b..c3cacd64b7 100644 --- a/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn @@ -69,7 +69,6 @@ ohos_fuzztest("AbilityAppMgrAppRunningManagerFuzzTest") { "ability_base:configuration", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "appspawn:appspawn_client", "bundle_framework:appexecfwk_base", diff --git a/test/fuzztest/abilityappmgrevent_fuzzer/BUILD.gn b/test/fuzztest/abilityappmgrevent_fuzzer/BUILD.gn index 877aff573e..d9b5726416 100644 --- a/test/fuzztest/abilityappmgrevent_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityappmgrevent_fuzzer/BUILD.gn @@ -40,6 +40,7 @@ ohos_fuzztest("AbilityAppMgrEventFuzzTest") { configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:hisysevent_report", @@ -48,7 +49,6 @@ ohos_fuzztest("AbilityAppMgrEventFuzzTest") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/fuzztest/abilityappmgreventfirst_fuzzer/BUILD.gn b/test/fuzztest/abilityappmgreventfirst_fuzzer/BUILD.gn index e008b4a29e..71dd4a96ac 100644 --- a/test/fuzztest/abilityappmgreventfirst_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityappmgreventfirst_fuzzer/BUILD.gn @@ -40,6 +40,7 @@ ohos_fuzztest("AbilityAppMgrEventFirstFuzzTest") { configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:hisysevent_report", @@ -48,7 +49,6 @@ ohos_fuzztest("AbilityAppMgrEventFirstFuzzTest") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/fuzztest/abilityframeworksnativejsworker_fuzzer/BUILD.gn b/test/fuzztest/abilityframeworksnativejsworker_fuzzer/BUILD.gn index bd49eecad7..0189d47a4c 100644 --- a/test/fuzztest/abilityframeworksnativejsworker_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityframeworksnativejsworker_fuzzer/BUILD.gn @@ -51,8 +51,11 @@ ohos_fuzztest("AbilityFrameworksNativeJsWorkerFuzzTest") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${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_path}/js_environment/frameworks/js_environment:js_environment", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", @@ -62,9 +65,6 @@ ohos_fuzztest("AbilityFrameworksNativeJsWorkerFuzzTest") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:js_environment", - "ability_runtime:runtime", "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/fuzztest/abilityframeworksnativeohosjsenvlogger_fuzzer/BUILD.gn b/test/fuzztest/abilityframeworksnativeohosjsenvlogger_fuzzer/BUILD.gn index 22001c9818..81b4198103 100644 --- a/test/fuzztest/abilityframeworksnativeohosjsenvlogger_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityframeworksnativeohosjsenvlogger_fuzzer/BUILD.gn @@ -58,8 +58,11 @@ ohos_fuzztest("AbilityFrameworksNativeOhosJsEnvLoggerFuzzTest") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${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_path}/js_environment/frameworks/js_environment:js_environment", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", @@ -70,9 +73,6 @@ ohos_fuzztest("AbilityFrameworksNativeOhosJsEnvLoggerFuzzTest") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:js_environment", - "ability_runtime:runtime", "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/fuzztest/abilitymgrabilitymanagerstub_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrabilitymanagerstub_fuzzer/BUILD.gn index bbf1787902..e6efc7e95b 100644 --- a/test/fuzztest/abilitymgrabilitymanagerstub_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrabilitymanagerstub_fuzzer/BUILD.gn @@ -53,6 +53,7 @@ ohos_fuzztest("AbilityMgrAbilityManagerStubFuzzTest") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${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}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -64,8 +65,6 @@ ohos_fuzztest("AbilityMgrAbilityManagerStubFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn index 65f22a72ab..3707c90a5d 100644 --- a/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn @@ -73,6 +73,7 @@ ohos_fuzztest("AbilityMgrAppExitReasonHelperFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/global/common:runtime_utils", @@ -89,7 +90,6 @@ ohos_fuzztest("AbilityMgrAppExitReasonHelperFuzzTest") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", diff --git a/test/fuzztest/abilitymgrcontrolinterceptor_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrcontrolinterceptor_fuzzer/BUILD.gn index efa5360d98..a7dfffd962 100644 --- a/test/fuzztest/abilitymgrcontrolinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrcontrolinterceptor_fuzzer/BUILD.gn @@ -54,6 +54,7 @@ ohos_fuzztest("AbilityMgrControlInterceptorFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -65,7 +66,6 @@ ohos_fuzztest("AbilityMgrControlInterceptorFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/fuzztest/abilitymgrdisposedruleinterceptor_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrdisposedruleinterceptor_fuzzer/BUILD.gn index 64d5702683..3f7a75e644 100644 --- a/test/fuzztest/abilitymgrdisposedruleinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrdisposedruleinterceptor_fuzzer/BUILD.gn @@ -49,6 +49,7 @@ ohos_fuzztest("AbilitymgrDisposedRuleInterceptorFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -59,7 +60,6 @@ ohos_fuzztest("AbilitymgrDisposedRuleInterceptorFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/fuzztest/abilitymgrecologicalruleinterceptor_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrecologicalruleinterceptor_fuzzer/BUILD.gn index 01f73e9e31..024c6c8eae 100644 --- a/test/fuzztest/abilitymgrecologicalruleinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrecologicalruleinterceptor_fuzzer/BUILD.gn @@ -49,6 +49,7 @@ ohos_fuzztest("AbilitymgrEcologicalRuleInterceptorFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -59,7 +60,6 @@ ohos_fuzztest("AbilitymgrEcologicalRuleInterceptorFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/fuzztest/abilitymgrecologicalrulemgrserviceparam_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrecologicalrulemgrserviceparam_fuzzer/BUILD.gn index d05fe54633..dc7dd504ad 100644 --- a/test/fuzztest/abilitymgrecologicalrulemgrserviceparam_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrecologicalrulemgrserviceparam_fuzzer/BUILD.gn @@ -50,6 +50,7 @@ ohos_fuzztest("AbilityMgrEcologicalRuleMgrServiceParamFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -60,7 +61,6 @@ ohos_fuzztest("AbilityMgrEcologicalRuleMgrServiceParamFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/fuzztest/abilitymgrecologicalrulemgrserviceparamfirst_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrecologicalrulemgrserviceparamfirst_fuzzer/BUILD.gn index 0c9e5805f2..68f465967e 100644 --- a/test/fuzztest/abilitymgrecologicalrulemgrserviceparamfirst_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrecologicalrulemgrserviceparamfirst_fuzzer/BUILD.gn @@ -50,6 +50,7 @@ ohos_fuzztest("AbilityMgrEcologicalRuleMgrServiceParamFirstFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -60,7 +61,6 @@ ohos_fuzztest("AbilityMgrEcologicalRuleMgrServiceParamFirstFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn index 600bccb62b..d0fc9399db 100644 --- a/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn @@ -54,6 +54,7 @@ ohos_fuzztest("AbilityMgrExtensionRecordFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -64,7 +65,6 @@ ohos_fuzztest("AbilityMgrExtensionRecordFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn index efdd1672f9..4fad7ebfb9 100644 --- a/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn @@ -60,6 +60,7 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteManagerFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -72,8 +73,6 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteManagerFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "bundle_framework:libappexecfwk_common", diff --git a/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn index 89b9174485..e3c30387ff 100644 --- a/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn @@ -54,6 +54,7 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteResultFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -66,8 +67,6 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteResultFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "bundle_framework:libappexecfwk_common", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn index 36a5c80eda..1916158291 100644 --- a/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn @@ -54,6 +54,7 @@ ohos_fuzztest("AbilityMgrInsightIntentUtilsFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -66,8 +67,6 @@ ohos_fuzztest("AbilityMgrInsightIntentUtilsFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "bundle_framework:libappexecfwk_common", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/fuzztest/abilitymgrinterceptorexecuter_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrinterceptorexecuter_fuzzer/BUILD.gn index 9ade4d24bf..09464d0a36 100644 --- a/test/fuzztest/abilitymgrinterceptorexecuter_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrinterceptorexecuter_fuzzer/BUILD.gn @@ -54,6 +54,7 @@ ohos_fuzztest("AbilityMgrInterceptorExecuterFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -65,7 +66,6 @@ ohos_fuzztest("AbilityMgrInterceptorExecuterFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/fuzztest/abilitymgrjumpinterceptor_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrjumpinterceptor_fuzzer/BUILD.gn index 4397e69a9d..3a14d30fd3 100644 --- a/test/fuzztest/abilitymgrjumpinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrjumpinterceptor_fuzzer/BUILD.gn @@ -55,6 +55,7 @@ ohos_fuzztest("AbilityMgrJumpInterceptorFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -66,7 +67,6 @@ ohos_fuzztest("AbilityMgrJumpInterceptorFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn index e511ad7e53..e2936dd8d6 100644 --- a/test/fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn @@ -54,6 +54,7 @@ ohos_fuzztest("AbilityMgrRdbParserUtilFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -64,7 +65,6 @@ ohos_fuzztest("AbilityMgrRdbParserUtilFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "c_utils:utils", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", diff --git a/test/fuzztest/abilitymgrrest_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrrest_fuzzer/BUILD.gn index ce5b88b18b..0dc2631e1e 100755 --- a/test/fuzztest/abilitymgrrest_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrrest_fuzzer/BUILD.gn @@ -38,6 +38,7 @@ ohos_fuzztest("AbilityMgrRestFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${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_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/appmgr:libappms", @@ -47,7 +48,6 @@ ohos_fuzztest("AbilityMgrRestFuzzTest") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "appspawn:appspawn_client", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn b/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn index 32242ea9af..ac3154eb53 100644 --- a/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn @@ -55,6 +55,7 @@ ohos_fuzztest("AbilityMgrUiExtensionRecordFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -65,7 +66,6 @@ ohos_fuzztest("AbilityMgrUiExtensionRecordFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", diff --git a/test/fuzztest/attachabilitythread_fuzzer/BUILD.gn b/test/fuzztest/attachabilitythread_fuzzer/BUILD.gn index 673d67cdd6..9baa8bc328 100755 --- a/test/fuzztest/attachabilitythread_fuzzer/BUILD.gn +++ b/test/fuzztest/attachabilitythread_fuzzer/BUILD.gn @@ -40,6 +40,7 @@ ohos_fuzztest("AttachAbilityThreadFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -47,7 +48,6 @@ ohos_fuzztest("AttachAbilityThreadFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/fuzztest/cancelwantsender_fuzzer/BUILD.gn b/test/fuzztest/cancelwantsender_fuzzer/BUILD.gn index 2d2660a622..cc83ae09c5 100755 --- a/test/fuzztest/cancelwantsender_fuzzer/BUILD.gn +++ b/test/fuzztest/cancelwantsender_fuzzer/BUILD.gn @@ -38,13 +38,15 @@ ohos_fuzztest("CancelWantSenderFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", - "ability_runtime:wantagent_innerkits", "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", diff --git a/test/fuzztest/cleanallmissions_fuzzer/BUILD.gn b/test/fuzztest/cleanallmissions_fuzzer/BUILD.gn index 8e65cec020..173d4da6b7 100755 --- a/test/fuzztest/cleanallmissions_fuzzer/BUILD.gn +++ b/test/fuzztest/cleanallmissions_fuzzer/BUILD.gn @@ -38,12 +38,14 @@ ohos_fuzztest("CleanAllMissionsFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "c_utils:utils", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/test/fuzztest/cleanmission_fuzzer/BUILD.gn b/test/fuzztest/cleanmission_fuzzer/BUILD.gn index ad77ce4159..f754a1aa31 100755 --- a/test/fuzztest/cleanmission_fuzzer/BUILD.gn +++ b/test/fuzztest/cleanmission_fuzzer/BUILD.gn @@ -37,12 +37,14 @@ ohos_fuzztest("CleanMissionFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "c_utils:utils", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/test/fuzztest/clearupapplicationdata_fuzzer/BUILD.gn b/test/fuzztest/clearupapplicationdata_fuzzer/BUILD.gn index 844bf63b14..414198c4bd 100755 --- a/test/fuzztest/clearupapplicationdata_fuzzer/BUILD.gn +++ b/test/fuzztest/clearupapplicationdata_fuzzer/BUILD.gn @@ -38,12 +38,14 @@ ohos_fuzztest("ClearUpApplicationDataFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", diff --git a/test/fuzztest/connectability_fuzzer/BUILD.gn b/test/fuzztest/connectability_fuzzer/BUILD.gn index dac4d0d933..b602a7d9a0 100755 --- a/test/fuzztest/connectability_fuzzer/BUILD.gn +++ b/test/fuzztest/connectability_fuzzer/BUILD.gn @@ -46,9 +46,10 @@ ohos_fuzztest("ConnectAbilityFuzzTest") { 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_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:app_context_utils", "${ability_runtime_path}/services/abilitymgr:abilityms_target", @@ -57,7 +58,6 @@ ohos_fuzztest("ConnectAbilityFuzzTest") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:ability_manager", "appspawn:appspawn_client", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/fuzztest/connectionobserverclient_fuzzer/BUILD.gn b/test/fuzztest/connectionobserverclient_fuzzer/BUILD.gn index c372caffb9..3fde9707aa 100755 --- a/test/fuzztest/connectionobserverclient_fuzzer/BUILD.gn +++ b/test/fuzztest/connectionobserverclient_fuzzer/BUILD.gn @@ -43,6 +43,7 @@ ohos_fuzztest("ConnectionObserverClientFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -50,7 +51,6 @@ ohos_fuzztest("ConnectionObserverClientFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/connectionobserverclientimplfifth_fuzzer/BUILD.gn b/test/fuzztest/connectionobserverclientimplfifth_fuzzer/BUILD.gn index 3d7beda74b..5b67b6f3fb 100644 --- a/test/fuzztest/connectionobserverclientimplfifth_fuzzer/BUILD.gn +++ b/test/fuzztest/connectionobserverclientimplfifth_fuzzer/BUILD.gn @@ -43,6 +43,7 @@ ohos_fuzztest("ConnectionObserverClientImplFifthFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -50,15 +51,14 @@ ohos_fuzztest("ConnectionObserverClientImplFifthFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "ffrt:libffrt", - "hisysevent:libhisysevent", "hilog:libhilog", + "hisysevent:libhisysevent", "input:libmmi-client", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/fuzztest/connectionobserverclientimplfirst_fuzzer/BUILD.gn b/test/fuzztest/connectionobserverclientimplfirst_fuzzer/BUILD.gn index 893230c831..6ca274b39b 100644 --- a/test/fuzztest/connectionobserverclientimplfirst_fuzzer/BUILD.gn +++ b/test/fuzztest/connectionobserverclientimplfirst_fuzzer/BUILD.gn @@ -43,6 +43,7 @@ ohos_fuzztest("ConnectionObserverClientImplFirstFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -50,15 +51,14 @@ ohos_fuzztest("ConnectionObserverClientImplFirstFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "ffrt:libffrt", - "hisysevent:libhisysevent", "hilog:libhilog", + "hisysevent:libhisysevent", "input:libmmi-client", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/fuzztest/connectionobserverclientimplfourth_fuzzer/BUILD.gn b/test/fuzztest/connectionobserverclientimplfourth_fuzzer/BUILD.gn index df2c25e215..11b2bdb807 100644 --- a/test/fuzztest/connectionobserverclientimplfourth_fuzzer/BUILD.gn +++ b/test/fuzztest/connectionobserverclientimplfourth_fuzzer/BUILD.gn @@ -43,6 +43,7 @@ ohos_fuzztest("ConnectionObserverClientImplFourthFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -50,15 +51,14 @@ ohos_fuzztest("ConnectionObserverClientImplFourthFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "ffrt:libffrt", - "hisysevent:libhisysevent", "hilog:libhilog", + "hisysevent:libhisysevent", "input:libmmi-client", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/fuzztest/connectionobserverclientimplsecond_fuzzer/BUILD.gn b/test/fuzztest/connectionobserverclientimplsecond_fuzzer/BUILD.gn index 4a83cd2044..db1b1f6d41 100644 --- a/test/fuzztest/connectionobserverclientimplsecond_fuzzer/BUILD.gn +++ b/test/fuzztest/connectionobserverclientimplsecond_fuzzer/BUILD.gn @@ -43,6 +43,7 @@ ohos_fuzztest("ConnectionObserverClientImplSecondFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -50,15 +51,14 @@ ohos_fuzztest("ConnectionObserverClientImplSecondFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "ffrt:libffrt", - "hisysevent:libhisysevent", "hilog:libhilog", + "hisysevent:libhisysevent", "input:libmmi-client", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/fuzztest/connectionobserverclientimplthird_fuzzer/BUILD.gn b/test/fuzztest/connectionobserverclientimplthird_fuzzer/BUILD.gn index ae2c6aaf55..c7a73f2f60 100644 --- a/test/fuzztest/connectionobserverclientimplthird_fuzzer/BUILD.gn +++ b/test/fuzztest/connectionobserverclientimplthird_fuzzer/BUILD.gn @@ -43,6 +43,7 @@ ohos_fuzztest("ConnectionObserverClientImplThirdFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -50,15 +51,14 @@ ohos_fuzztest("ConnectionObserverClientImplThirdFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "ffrt:libffrt", - "hisysevent:libhisysevent", "hilog:libhilog", + "hisysevent:libhisysevent", "input:libmmi-client", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/fuzztest/connectionstatemanager_fuzzer/BUILD.gn b/test/fuzztest/connectionstatemanager_fuzzer/BUILD.gn index 4481e4bde6..16e10ec68b 100755 --- a/test/fuzztest/connectionstatemanager_fuzzer/BUILD.gn +++ b/test/fuzztest/connectionstatemanager_fuzzer/BUILD.gn @@ -43,6 +43,7 @@ ohos_fuzztest("ConnectionStateManagerFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -50,7 +51,6 @@ ohos_fuzztest("ConnectionStateManagerFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/continueability_fuzzer/BUILD.gn b/test/fuzztest/continueability_fuzzer/BUILD.gn index fa7dc2fcdf..7f4c86b2a7 100755 --- a/test/fuzztest/continueability_fuzzer/BUILD.gn +++ b/test/fuzztest/continueability_fuzzer/BUILD.gn @@ -38,12 +38,14 @@ ohos_fuzztest("ContinueAbilityFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "c_utils:utils", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/test/fuzztest/continuemission_fuzzer/BUILD.gn b/test/fuzztest/continuemission_fuzzer/BUILD.gn index 37736fb48b..70956c3e18 100755 --- a/test/fuzztest/continuemission_fuzzer/BUILD.gn +++ b/test/fuzztest/continuemission_fuzzer/BUILD.gn @@ -38,12 +38,14 @@ ohos_fuzztest("ContinueMissionFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "c_utils:utils", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/test/fuzztest/crowdtestinterceptor_fuzzer/BUILD.gn b/test/fuzztest/crowdtestinterceptor_fuzzer/BUILD.gn index 6393b062d6..f93ae95184 100644 --- a/test/fuzztest/crowdtestinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/crowdtestinterceptor_fuzzer/BUILD.gn @@ -49,6 +49,7 @@ ohos_fuzztest("CrowdTestInterceptorFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -59,7 +60,6 @@ ohos_fuzztest("CrowdTestInterceptorFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/fuzztest/dataabilitymanager_fuzzer/BUILD.gn b/test/fuzztest/dataabilitymanager_fuzzer/BUILD.gn index 80511f78c5..2d0bace417 100755 --- a/test/fuzztest/dataabilitymanager_fuzzer/BUILD.gn +++ b/test/fuzztest/dataabilitymanager_fuzzer/BUILD.gn @@ -44,6 +44,7 @@ ohos_fuzztest("DataAbilityManagerFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -51,7 +52,6 @@ ohos_fuzztest("DataAbilityManagerFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/dataabilityrecord_fuzzer/BUILD.gn b/test/fuzztest/dataabilityrecord_fuzzer/BUILD.gn index 129457d205..6700c99e55 100644 --- a/test/fuzztest/dataabilityrecord_fuzzer/BUILD.gn +++ b/test/fuzztest/dataabilityrecord_fuzzer/BUILD.gn @@ -50,6 +50,7 @@ ohos_fuzztest("DataAbilityRecordFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -57,7 +58,6 @@ ohos_fuzztest("DataAbilityRecordFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/dataabilityrecordfirst_fuzzer/BUILD.gn b/test/fuzztest/dataabilityrecordfirst_fuzzer/BUILD.gn index a176d9bee6..ca10ac2a0d 100644 --- a/test/fuzztest/dataabilityrecordfirst_fuzzer/BUILD.gn +++ b/test/fuzztest/dataabilityrecordfirst_fuzzer/BUILD.gn @@ -50,6 +50,7 @@ ohos_fuzztest("DataAbilityRecordFirstFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -57,7 +58,6 @@ ohos_fuzztest("DataAbilityRecordFirstFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/dataabilityrecordsecond_fuzzer/BUILD.gn b/test/fuzztest/dataabilityrecordsecond_fuzzer/BUILD.gn index 7623b03b26..32097275e7 100644 --- a/test/fuzztest/dataabilityrecordsecond_fuzzer/BUILD.gn +++ b/test/fuzztest/dataabilityrecordsecond_fuzzer/BUILD.gn @@ -50,6 +50,7 @@ ohos_fuzztest("DataAbilityRecordSecondFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -57,7 +58,6 @@ ohos_fuzztest("DataAbilityRecordSecondFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/dumpstate_fuzzer/BUILD.gn b/test/fuzztest/dumpstate_fuzzer/BUILD.gn index 4f61c6065a..58d272bdff 100644 --- a/test/fuzztest/dumpstate_fuzzer/BUILD.gn +++ b/test/fuzztest/dumpstate_fuzzer/BUILD.gn @@ -39,6 +39,7 @@ ohos_fuzztest("DumpStateFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -46,7 +47,6 @@ ohos_fuzztest("DumpStateFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/fuzztest/dumpsysstate_fuzzer/BUILD.gn b/test/fuzztest/dumpsysstate_fuzzer/BUILD.gn index 2573b2ab7a..dda58b6d09 100644 --- a/test/fuzztest/dumpsysstate_fuzzer/BUILD.gn +++ b/test/fuzztest/dumpsysstate_fuzzer/BUILD.gn @@ -39,6 +39,7 @@ ohos_fuzztest("DumpSysStateFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -46,7 +47,6 @@ ohos_fuzztest("DumpSysStateFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/fuzztest/exitinfodatamanagerfirst_fuzzer/BUILD.gn b/test/fuzztest/exitinfodatamanagerfirst_fuzzer/BUILD.gn index f2d6426ef1..73de0ede48 100644 --- a/test/fuzztest/exitinfodatamanagerfirst_fuzzer/BUILD.gn +++ b/test/fuzztest/exitinfodatamanagerfirst_fuzzer/BUILD.gn @@ -56,6 +56,7 @@ ohos_fuzztest("ExitInfoDataManagerFirstFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/global/freeze:freeze_util", @@ -70,7 +71,6 @@ ohos_fuzztest("ExitInfoDataManagerFirstFuzzTest") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", diff --git a/test/fuzztest/exitinfodatamanagersecond_fuzzer/BUILD.gn b/test/fuzztest/exitinfodatamanagersecond_fuzzer/BUILD.gn index 3ca56541a8..288457ee7b 100644 --- a/test/fuzztest/exitinfodatamanagersecond_fuzzer/BUILD.gn +++ b/test/fuzztest/exitinfodatamanagersecond_fuzzer/BUILD.gn @@ -56,6 +56,7 @@ ohos_fuzztest("ExitInfoDataManagerSecondFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/global/freeze:freeze_util", @@ -70,7 +71,6 @@ ohos_fuzztest("ExitInfoDataManagerSecondFuzzTest") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", diff --git a/test/fuzztest/exitinfodatamanagerthird_fuzzer/BUILD.gn b/test/fuzztest/exitinfodatamanagerthird_fuzzer/BUILD.gn index 7e811a1975..55b86297ec 100644 --- a/test/fuzztest/exitinfodatamanagerthird_fuzzer/BUILD.gn +++ b/test/fuzztest/exitinfodatamanagerthird_fuzzer/BUILD.gn @@ -56,6 +56,7 @@ ohos_fuzztest("ExitInfoDataManagerThirdFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/global/freeze:freeze_util", @@ -70,7 +71,6 @@ ohos_fuzztest("ExitInfoDataManagerThirdFuzzTest") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", diff --git a/test/fuzztest/extensioncontrolinterceptor_fuzzer/BUILD.gn b/test/fuzztest/extensioncontrolinterceptor_fuzzer/BUILD.gn index 4e58fc1723..f3580e5a33 100644 --- a/test/fuzztest/extensioncontrolinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/extensioncontrolinterceptor_fuzzer/BUILD.gn @@ -54,6 +54,7 @@ ohos_fuzztest("ExtensionControlInterceptorFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -65,7 +66,6 @@ ohos_fuzztest("ExtensionControlInterceptorFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/fuzztest/extensioncontrolinterceptorfirst_fuzzer/BUILD.gn b/test/fuzztest/extensioncontrolinterceptorfirst_fuzzer/BUILD.gn index 043f365bc5..742382132a 100644 --- a/test/fuzztest/extensioncontrolinterceptorfirst_fuzzer/BUILD.gn +++ b/test/fuzztest/extensioncontrolinterceptorfirst_fuzzer/BUILD.gn @@ -54,6 +54,7 @@ ohos_fuzztest("ExtensionControlInterceptorFirstFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -65,7 +66,6 @@ ohos_fuzztest("ExtensionControlInterceptorFirstFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/fuzztest/forcetimeoutfortest_fuzzer/BUILD.gn b/test/fuzztest/forcetimeoutfortest_fuzzer/BUILD.gn index e2e82d2fee..4c156fb6ba 100644 --- a/test/fuzztest/forcetimeoutfortest_fuzzer/BUILD.gn +++ b/test/fuzztest/forcetimeoutfortest_fuzzer/BUILD.gn @@ -40,6 +40,7 @@ ohos_fuzztest("ForceTimeoutForTestFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -47,7 +48,6 @@ ohos_fuzztest("ForceTimeoutForTestFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/fuzztest/getappmemorysize_fuzzer/BUILD.gn b/test/fuzztest/getappmemorysize_fuzzer/BUILD.gn index 242bddf7a2..5d1c01d1b9 100755 --- a/test/fuzztest/getappmemorysize_fuzzer/BUILD.gn +++ b/test/fuzztest/getappmemorysize_fuzzer/BUILD.gn @@ -38,12 +38,14 @@ ohos_fuzztest("GetAppMemorySizeFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "c_utils:utils", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/test/fuzztest/getmissionidbytoken_fuzzer/BUILD.gn b/test/fuzztest/getmissionidbytoken_fuzzer/BUILD.gn index a42f4972c9..1fbb7aa105 100755 --- a/test/fuzztest/getmissionidbytoken_fuzzer/BUILD.gn +++ b/test/fuzztest/getmissionidbytoken_fuzzer/BUILD.gn @@ -40,13 +40,13 @@ ohos_fuzztest("GetMissionIdByTokenFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/fuzztest/getmissioninfos_fuzzer/BUILD.gn b/test/fuzztest/getmissioninfos_fuzzer/BUILD.gn index e7cc49b92f..112afd16ed 100755 --- a/test/fuzztest/getmissioninfos_fuzzer/BUILD.gn +++ b/test/fuzztest/getmissioninfos_fuzzer/BUILD.gn @@ -41,12 +41,12 @@ ohos_fuzztest("GetMissionInfosFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/app_manager:app_manager", ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "c_utils:utils", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/test/fuzztest/getwantsender_fuzzer/BUILD.gn b/test/fuzztest/getwantsender_fuzzer/BUILD.gn index d29950afc5..cef8153dda 100755 --- a/test/fuzztest/getwantsender_fuzzer/BUILD.gn +++ b/test/fuzztest/getwantsender_fuzzer/BUILD.gn @@ -43,6 +43,7 @@ ohos_fuzztest("GetWantSenderFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", @@ -50,7 +51,6 @@ ohos_fuzztest("GetWantSenderFuzzTest") { external_deps = [ "ability_base:want", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/fuzztest/isramconstraineddevice_fuzzer/BUILD.gn b/test/fuzztest/isramconstraineddevice_fuzzer/BUILD.gn index 023a82da95..2b7d0e9c06 100755 --- a/test/fuzztest/isramconstraineddevice_fuzzer/BUILD.gn +++ b/test/fuzztest/isramconstraineddevice_fuzzer/BUILD.gn @@ -38,12 +38,14 @@ ohos_fuzztest("IsRamConstrainedDeviceFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "c_utils:utils", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/test/fuzztest/killprocessesbybundlename_fuzzer/BUILD.gn b/test/fuzztest/killprocessesbybundlename_fuzzer/BUILD.gn index 75eb86ef7c..71e262b22a 100755 --- a/test/fuzztest/killprocessesbybundlename_fuzzer/BUILD.gn +++ b/test/fuzztest/killprocessesbybundlename_fuzzer/BUILD.gn @@ -38,12 +38,14 @@ ohos_fuzztest("KillProcessesByBundleNameFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", diff --git a/test/fuzztest/localpendingwant_fuzzer/BUILD.gn b/test/fuzztest/localpendingwant_fuzzer/BUILD.gn index b8603841b3..b79dfe363d 100644 --- a/test/fuzztest/localpendingwant_fuzzer/BUILD.gn +++ b/test/fuzztest/localpendingwant_fuzzer/BUILD.gn @@ -36,10 +36,13 @@ ohos_fuzztest("LocalPendingWantFuzzTest") { sources = [ "localpendingwant_fuzzer.cpp" ] + deps = [ + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", + ] + external_deps = [ "ability_base:base", "ability_base:want", - "ability_runtime:wantagent_innerkits", "c_utils:utils", "common_event_service:cesfwk_innerkits", "ipc:ipc_core", diff --git a/test/fuzztest/lockmissionforcleanup_fuzzer/BUILD.gn b/test/fuzztest/lockmissionforcleanup_fuzzer/BUILD.gn index f8bcf26cd0..ba9cfd9c02 100644 --- a/test/fuzztest/lockmissionforcleanup_fuzzer/BUILD.gn +++ b/test/fuzztest/lockmissionforcleanup_fuzzer/BUILD.gn @@ -38,12 +38,14 @@ ohos_fuzztest("LockMissionForCleanupFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "c_utils:utils", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/test/fuzztest/minimizeability_fuzzer/BUILD.gn b/test/fuzztest/minimizeability_fuzzer/BUILD.gn index beba11353e..fbeef9dcfb 100644 --- a/test/fuzztest/minimizeability_fuzzer/BUILD.gn +++ b/test/fuzztest/minimizeability_fuzzer/BUILD.gn @@ -40,6 +40,7 @@ ohos_fuzztest("MinimizeAbilityFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -47,7 +48,6 @@ ohos_fuzztest("MinimizeAbilityFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/fuzztest/missionlistenercontroller_fuzzer/BUILD.gn b/test/fuzztest/missionlistenercontroller_fuzzer/BUILD.gn index b040c29df5..96c84f707a 100644 --- a/test/fuzztest/missionlistenercontroller_fuzzer/BUILD.gn +++ b/test/fuzztest/missionlistenercontroller_fuzzer/BUILD.gn @@ -44,6 +44,7 @@ ohos_fuzztest("MissionListenerControllerFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -52,7 +53,6 @@ ohos_fuzztest("MissionListenerControllerFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/missionlistmanagerfirst_fuzzer/BUILD.gn b/test/fuzztest/missionlistmanagerfirst_fuzzer/BUILD.gn index 29b0e0281d..a9f519c68a 100644 --- a/test/fuzztest/missionlistmanagerfirst_fuzzer/BUILD.gn +++ b/test/fuzztest/missionlistmanagerfirst_fuzzer/BUILD.gn @@ -44,6 +44,7 @@ ohos_fuzztest("MissionListManagerFirstFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -52,7 +53,6 @@ ohos_fuzztest("MissionListManagerFirstFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/missionlistmanagerfourth_fuzzer/BUILD.gn b/test/fuzztest/missionlistmanagerfourth_fuzzer/BUILD.gn index f348fce63d..8b3a08663a 100644 --- a/test/fuzztest/missionlistmanagerfourth_fuzzer/BUILD.gn +++ b/test/fuzztest/missionlistmanagerfourth_fuzzer/BUILD.gn @@ -43,6 +43,7 @@ ohos_fuzztest("MissionListManagerFourthFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -51,7 +52,6 @@ ohos_fuzztest("MissionListManagerFourthFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/missionlistmanagersecond_fuzzer/BUILD.gn b/test/fuzztest/missionlistmanagersecond_fuzzer/BUILD.gn index 33baf730f0..11ff0bfe36 100644 --- a/test/fuzztest/missionlistmanagersecond_fuzzer/BUILD.gn +++ b/test/fuzztest/missionlistmanagersecond_fuzzer/BUILD.gn @@ -44,6 +44,7 @@ ohos_fuzztest("MissionListManagerSecondFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -52,7 +53,6 @@ ohos_fuzztest("MissionListManagerSecondFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:connection_obs_manager", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_core", diff --git a/test/fuzztest/missionlistmanagerthird_fuzzer/BUILD.gn b/test/fuzztest/missionlistmanagerthird_fuzzer/BUILD.gn index 22cc52f929..5105600afa 100644 --- a/test/fuzztest/missionlistmanagerthird_fuzzer/BUILD.gn +++ b/test/fuzztest/missionlistmanagerthird_fuzzer/BUILD.gn @@ -43,6 +43,7 @@ ohos_fuzztest("MissionListManagerThirdFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -52,7 +53,6 @@ ohos_fuzztest("MissionListManagerThirdFuzzTest") { "ability_base:base", "ability_base:want", "ability_base:zuri", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/notifycompletecontinuation_fuzzer/BUILD.gn b/test/fuzztest/notifycompletecontinuation_fuzzer/BUILD.gn index f1d51be972..2375b0adde 100644 --- a/test/fuzztest/notifycompletecontinuation_fuzzer/BUILD.gn +++ b/test/fuzztest/notifycompletecontinuation_fuzzer/BUILD.gn @@ -38,12 +38,14 @@ ohos_fuzztest("NotifyCompleteContinuationFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "c_utils:utils", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/test/fuzztest/notifycontinuationresult_fuzzer/BUILD.gn b/test/fuzztest/notifycontinuationresult_fuzzer/BUILD.gn index d3f0710936..05b9b04dec 100644 --- a/test/fuzztest/notifycontinuationresult_fuzzer/BUILD.gn +++ b/test/fuzztest/notifycontinuationresult_fuzzer/BUILD.gn @@ -38,12 +38,14 @@ ohos_fuzztest("NotifyContinuationResultFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "c_utils:utils", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/test/fuzztest/pendingwantmanager_fuzzer/BUILD.gn b/test/fuzztest/pendingwantmanager_fuzzer/BUILD.gn index 42698628ef..2be893ee33 100644 --- a/test/fuzztest/pendingwantmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/pendingwantmanager_fuzzer/BUILD.gn @@ -44,6 +44,8 @@ ohos_fuzztest("PendingWantManagerFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -53,8 +55,6 @@ ohos_fuzztest("PendingWantManagerFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/preloaduiextstateobserver_fuzzer/BUILD.gn b/test/fuzztest/preloaduiextstateobserver_fuzzer/BUILD.gn index 86874d62fb..1db92236bc 100644 --- a/test/fuzztest/preloaduiextstateobserver_fuzzer/BUILD.gn +++ b/test/fuzztest/preloaduiextstateobserver_fuzzer/BUILD.gn @@ -53,6 +53,7 @@ ohos_fuzztest("PreLoadUIExtStateObserverFuzzTest") { "${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", + "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/global/freeze:freeze_util", @@ -61,7 +62,7 @@ ohos_fuzztest("PreLoadUIExtStateObserverFuzzTest") { "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", - ] + ] external_deps = [ "ability_base:base", @@ -105,7 +106,6 @@ ohos_fuzztest("PreLoadUIExtStateObserverFuzzTest") { "window_manager:scene_session", "window_manager:session_manager_lite", "window_manager:sms", - "ability_runtime:runtime", ] if (ability_runtime_dsoftbus_enable) { external_deps += [ "dsoftbus:softbus_client" ] diff --git a/test/fuzztest/registermissionlistener_fuzzer/BUILD.gn b/test/fuzztest/registermissionlistener_fuzzer/BUILD.gn index 640437829f..d46c2ebade 100755 --- a/test/fuzztest/registermissionlistener_fuzzer/BUILD.gn +++ b/test/fuzztest/registermissionlistener_fuzzer/BUILD.gn @@ -38,12 +38,14 @@ ohos_fuzztest("RegisterMissionListenerFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "c_utils:utils", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/test/fuzztest/releasedataability_fuzzer/BUILD.gn b/test/fuzztest/releasedataability_fuzzer/BUILD.gn index 4686e21ecb..e67c3f3480 100755 --- a/test/fuzztest/releasedataability_fuzzer/BUILD.gn +++ b/test/fuzztest/releasedataability_fuzzer/BUILD.gn @@ -40,6 +40,7 @@ ohos_fuzztest("ReleaseDataAbilityFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -47,7 +48,6 @@ ohos_fuzztest("ReleaseDataAbilityFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/fuzztest/residentprocessmanagereighth_fuzzer/BUILD.gn b/test/fuzztest/residentprocessmanagereighth_fuzzer/BUILD.gn index 547b28a587..8ca60766f5 100644 --- a/test/fuzztest/residentprocessmanagereighth_fuzzer/BUILD.gn +++ b/test/fuzztest/residentprocessmanagereighth_fuzzer/BUILD.gn @@ -44,6 +44,8 @@ ohos_fuzztest("ResidentProcessManagerEighthFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -53,8 +55,6 @@ ohos_fuzztest("ResidentProcessManagerEighthFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/residentprocessmanagereleven_fuzzer/BUILD.gn b/test/fuzztest/residentprocessmanagereleven_fuzzer/BUILD.gn index 1f494b8bad..80874b3766 100644 --- a/test/fuzztest/residentprocessmanagereleven_fuzzer/BUILD.gn +++ b/test/fuzztest/residentprocessmanagereleven_fuzzer/BUILD.gn @@ -45,6 +45,8 @@ ohos_fuzztest("ResidentProcessManagerElevenFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -54,8 +56,6 @@ ohos_fuzztest("ResidentProcessManagerElevenFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", @@ -63,8 +63,8 @@ ohos_fuzztest("ResidentProcessManagerElevenFuzzTest") { "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ffrt:libffrt", - "hisysevent:libhisysevent", "hilog:libhilog", + "hisysevent:libhisysevent", "input:libmmi-client", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/fuzztest/residentprocessmanagerfifth_fuzzer/BUILD.gn b/test/fuzztest/residentprocessmanagerfifth_fuzzer/BUILD.gn index c1116df8e1..3e6a5bbced 100644 --- a/test/fuzztest/residentprocessmanagerfifth_fuzzer/BUILD.gn +++ b/test/fuzztest/residentprocessmanagerfifth_fuzzer/BUILD.gn @@ -44,6 +44,8 @@ ohos_fuzztest("ResidentProcessManagerFifthFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -53,8 +55,6 @@ ohos_fuzztest("ResidentProcessManagerFifthFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/residentprocessmanagerfirst_fuzzer/BUILD.gn b/test/fuzztest/residentprocessmanagerfirst_fuzzer/BUILD.gn index 0faf3ff212..0d026d182a 100644 --- a/test/fuzztest/residentprocessmanagerfirst_fuzzer/BUILD.gn +++ b/test/fuzztest/residentprocessmanagerfirst_fuzzer/BUILD.gn @@ -45,6 +45,8 @@ ohos_fuzztest("ResidentProcessManagerFirstFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -54,8 +56,6 @@ ohos_fuzztest("ResidentProcessManagerFirstFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", @@ -63,8 +63,8 @@ ohos_fuzztest("ResidentProcessManagerFirstFuzzTest") { "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ffrt:libffrt", - "hisysevent:libhisysevent", "hilog:libhilog", + "hisysevent:libhisysevent", "input:libmmi-client", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/fuzztest/residentprocessmanagerfourth_fuzzer/BUILD.gn b/test/fuzztest/residentprocessmanagerfourth_fuzzer/BUILD.gn index 7caca3fd41..aad22fa1b2 100644 --- a/test/fuzztest/residentprocessmanagerfourth_fuzzer/BUILD.gn +++ b/test/fuzztest/residentprocessmanagerfourth_fuzzer/BUILD.gn @@ -44,6 +44,8 @@ ohos_fuzztest("ResidentProcessManagerFourthFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -53,8 +55,6 @@ ohos_fuzztest("ResidentProcessManagerFourthFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/residentprocessmanagerninth_fuzzer/BUILD.gn b/test/fuzztest/residentprocessmanagerninth_fuzzer/BUILD.gn index 7eea0b0097..c47ce331e0 100644 --- a/test/fuzztest/residentprocessmanagerninth_fuzzer/BUILD.gn +++ b/test/fuzztest/residentprocessmanagerninth_fuzzer/BUILD.gn @@ -44,6 +44,8 @@ ohos_fuzztest("ResidentProcessManagerNinthFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -53,8 +55,6 @@ ohos_fuzztest("ResidentProcessManagerNinthFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/residentprocessmanagersecond_fuzzer/BUILD.gn b/test/fuzztest/residentprocessmanagersecond_fuzzer/BUILD.gn index 6d1d6f57ac..60c00c189d 100644 --- a/test/fuzztest/residentprocessmanagersecond_fuzzer/BUILD.gn +++ b/test/fuzztest/residentprocessmanagersecond_fuzzer/BUILD.gn @@ -45,6 +45,8 @@ ohos_fuzztest("ResidentProcessManagerSecondFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -54,8 +56,6 @@ ohos_fuzztest("ResidentProcessManagerSecondFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", @@ -63,8 +63,8 @@ ohos_fuzztest("ResidentProcessManagerSecondFuzzTest") { "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ffrt:libffrt", - "hisysevent:libhisysevent", "hilog:libhilog", + "hisysevent:libhisysevent", "input:libmmi-client", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/fuzztest/residentprocessmanagerseventh_fuzzer/BUILD.gn b/test/fuzztest/residentprocessmanagerseventh_fuzzer/BUILD.gn index 3b3acbb387..9ddc8aa479 100644 --- a/test/fuzztest/residentprocessmanagerseventh_fuzzer/BUILD.gn +++ b/test/fuzztest/residentprocessmanagerseventh_fuzzer/BUILD.gn @@ -44,6 +44,8 @@ ohos_fuzztest("ResidentProcessManagerSeventhFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -53,8 +55,6 @@ ohos_fuzztest("ResidentProcessManagerSeventhFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/residentprocessmanagersixth_fuzzer/BUILD.gn b/test/fuzztest/residentprocessmanagersixth_fuzzer/BUILD.gn index 417461b685..ac788fee1d 100644 --- a/test/fuzztest/residentprocessmanagersixth_fuzzer/BUILD.gn +++ b/test/fuzztest/residentprocessmanagersixth_fuzzer/BUILD.gn @@ -44,6 +44,8 @@ ohos_fuzztest("ResidentProcessManagerSixthFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -53,8 +55,6 @@ ohos_fuzztest("ResidentProcessManagerSixthFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/residentprocessmanagertenth_fuzzer/BUILD.gn b/test/fuzztest/residentprocessmanagertenth_fuzzer/BUILD.gn index 6f1f7c57e8..5456adc572 100644 --- a/test/fuzztest/residentprocessmanagertenth_fuzzer/BUILD.gn +++ b/test/fuzztest/residentprocessmanagertenth_fuzzer/BUILD.gn @@ -44,6 +44,8 @@ ohos_fuzztest("ResidentProcessManagerTenthFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -53,8 +55,6 @@ ohos_fuzztest("ResidentProcessManagerTenthFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/residentprocessmanagerthird_fuzzer/BUILD.gn b/test/fuzztest/residentprocessmanagerthird_fuzzer/BUILD.gn index 99350237df..57cb12c04d 100644 --- a/test/fuzztest/residentprocessmanagerthird_fuzzer/BUILD.gn +++ b/test/fuzztest/residentprocessmanagerthird_fuzzer/BUILD.gn @@ -45,6 +45,8 @@ ohos_fuzztest("ResidentProcessManagerThirdFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -54,8 +56,6 @@ ohos_fuzztest("ResidentProcessManagerThirdFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", @@ -63,8 +63,8 @@ ohos_fuzztest("ResidentProcessManagerThirdFuzzTest") { "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ffrt:libffrt", - "hisysevent:libhisysevent", "hilog:libhilog", + "hisysevent:libhisysevent", "input:libmmi-client", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/fuzztest/residentprocessmanagerthirteenth_fuzzer/BUILD.gn b/test/fuzztest/residentprocessmanagerthirteenth_fuzzer/BUILD.gn index 2ed762c7a2..0af7428eba 100644 --- a/test/fuzztest/residentprocessmanagerthirteenth_fuzzer/BUILD.gn +++ b/test/fuzztest/residentprocessmanagerthirteenth_fuzzer/BUILD.gn @@ -44,6 +44,8 @@ ohos_fuzztest("ResidentProcessManagerThirteenthFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -53,8 +55,6 @@ ohos_fuzztest("ResidentProcessManagerThirteenthFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/residentprocessmanagertwelfth_fuzzer/BUILD.gn b/test/fuzztest/residentprocessmanagertwelfth_fuzzer/BUILD.gn index 98633e79f2..e60d3a59ed 100644 --- a/test/fuzztest/residentprocessmanagertwelfth_fuzzer/BUILD.gn +++ b/test/fuzztest/residentprocessmanagertwelfth_fuzzer/BUILD.gn @@ -44,6 +44,8 @@ ohos_fuzztest("ResidentProcessManagerTwelfthFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -53,8 +55,6 @@ ohos_fuzztest("ResidentProcessManagerTwelfthFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:connection_obs_manager", "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn b/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn index f84d6a1116..b4102cc2cd 100644 --- a/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn @@ -58,6 +58,8 @@ ohos_fuzztest("ScreenUnlockInterceptorFuzzTest") { } deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/appmgr:libappms", @@ -68,8 +70,6 @@ ohos_fuzztest("ScreenUnlockInterceptorFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", diff --git a/test/fuzztest/startabilitybycall_fuzzer/BUILD.gn b/test/fuzztest/startabilitybycall_fuzzer/BUILD.gn index 01bfa29404..cb6a59cc71 100755 --- a/test/fuzztest/startabilitybycall_fuzzer/BUILD.gn +++ b/test/fuzztest/startabilitybycall_fuzzer/BUILD.gn @@ -40,13 +40,13 @@ ohos_fuzztest("StartAbilityByCallFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/fuzztest/startotherappinterceptor_fuzzer/BUILD.gn b/test/fuzztest/startotherappinterceptor_fuzzer/BUILD.gn index 93ac8ecea6..174585579c 100644 --- a/test/fuzztest/startotherappinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/startotherappinterceptor_fuzzer/BUILD.gn @@ -56,6 +56,8 @@ ohos_fuzztest("StartOtherappinterceptorFuzzTest") { } deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -67,8 +69,6 @@ ohos_fuzztest("StartOtherappinterceptorFuzzTest") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", diff --git a/test/fuzztest/startserviceextensionability_fuzzer/BUILD.gn b/test/fuzztest/startserviceextensionability_fuzzer/BUILD.gn index a1850ef9a4..da263fb665 100755 --- a/test/fuzztest/startserviceextensionability_fuzzer/BUILD.gn +++ b/test/fuzztest/startserviceextensionability_fuzzer/BUILD.gn @@ -39,9 +39,10 @@ ohos_fuzztest("StartServiceExtensionAbilityFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:app_context_utils", "${ability_runtime_native_path}/appkit:appkit_delegator", @@ -49,7 +50,6 @@ ohos_fuzztest("StartServiceExtensionAbilityFuzzTest") { external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", "appspawn:appspawn_client", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/fuzztest/startsyncremotemissions_fuzzer/BUILD.gn b/test/fuzztest/startsyncremotemissions_fuzzer/BUILD.gn index fe1391be73..8b23c62c25 100755 --- a/test/fuzztest/startsyncremotemissions_fuzzer/BUILD.gn +++ b/test/fuzztest/startsyncremotemissions_fuzzer/BUILD.gn @@ -38,12 +38,14 @@ ohos_fuzztest("StartSyncRemoteMissionsFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "c_utils:utils", "eventhandler:libeventhandler", diff --git a/test/fuzztest/startuser_fuzzer/BUILD.gn b/test/fuzztest/startuser_fuzzer/BUILD.gn index 8b7119a85d..26630a04d9 100644 --- a/test/fuzztest/startuser_fuzzer/BUILD.gn +++ b/test/fuzztest/startuser_fuzzer/BUILD.gn @@ -37,12 +37,14 @@ ohos_fuzztest("StartUserFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "c_utils:utils", "eventhandler:libeventhandler", diff --git a/test/fuzztest/stopserviceextensionability_fuzzer/BUILD.gn b/test/fuzztest/stopserviceextensionability_fuzzer/BUILD.gn index 2a44089d33..a773f71d0a 100644 --- a/test/fuzztest/stopserviceextensionability_fuzzer/BUILD.gn +++ b/test/fuzztest/stopserviceextensionability_fuzzer/BUILD.gn @@ -40,9 +40,10 @@ ohos_fuzztest("StopServiceExtensionAbilityFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:app_context_utils", "${ability_runtime_native_path}/appkit:appkit_delegator", @@ -51,7 +52,6 @@ ohos_fuzztest("StopServiceExtensionAbilityFuzzTest") { external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", "appspawn:appspawn_client", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/fuzztest/stopsyncremotemissions_fuzzer/BUILD.gn b/test/fuzztest/stopsyncremotemissions_fuzzer/BUILD.gn index 4be168f1c8..6c41a202d2 100644 --- a/test/fuzztest/stopsyncremotemissions_fuzzer/BUILD.gn +++ b/test/fuzztest/stopsyncremotemissions_fuzzer/BUILD.gn @@ -38,12 +38,14 @@ ohos_fuzztest("StopSyncRemoteMissionsFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "c_utils:utils", "eventhandler:libeventhandler", diff --git a/test/fuzztest/stopuser_fuzzer/BUILD.gn b/test/fuzztest/stopuser_fuzzer/BUILD.gn index 24f4889a2e..08464ad3b0 100644 --- a/test/fuzztest/stopuser_fuzzer/BUILD.gn +++ b/test/fuzztest/stopuser_fuzzer/BUILD.gn @@ -37,12 +37,14 @@ ohos_fuzztest("StopUserFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "c_utils:utils", "eventhandler:libeventhandler", diff --git a/test/fuzztest/terminateability_fuzzer/BUILD.gn b/test/fuzztest/terminateability_fuzzer/BUILD.gn index 71d56a8bb8..3473ab565a 100644 --- a/test/fuzztest/terminateability_fuzzer/BUILD.gn +++ b/test/fuzztest/terminateability_fuzzer/BUILD.gn @@ -40,10 +40,11 @@ ohos_fuzztest("TerminateAbilityFuzzTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", "${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}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:app_context_utils", "${ability_runtime_native_path}/appkit:appkit_delegator", @@ -53,7 +54,6 @@ ohos_fuzztest("TerminateAbilityFuzzTest") { external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", "appspawn:appspawn_client", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/fuzztest/unlockmissionforcleanup_fuzzer/BUILD.gn b/test/fuzztest/unlockmissionforcleanup_fuzzer/BUILD.gn index e9db45d1f5..a5586f0f2b 100644 --- a/test/fuzztest/unlockmissionforcleanup_fuzzer/BUILD.gn +++ b/test/fuzztest/unlockmissionforcleanup_fuzzer/BUILD.gn @@ -38,12 +38,14 @@ ohos_fuzztest("UnlockMissionForCleanupFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "c_utils:utils", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/test/fuzztest/unregisterapplicationstateobserver_fuzzer/BUILD.gn b/test/fuzztest/unregisterapplicationstateobserver_fuzzer/BUILD.gn index f84272d666..e9f5709145 100644 --- a/test/fuzztest/unregisterapplicationstateobserver_fuzzer/BUILD.gn +++ b/test/fuzztest/unregisterapplicationstateobserver_fuzzer/BUILD.gn @@ -35,14 +35,14 @@ ohos_fuzztest("UnregisterApplicationStateObserverFuzzTest") { configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:task_handler_wrap", ] external_deps = [ "ability_base:base", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:app_manager", "appspawn:appspawn_client", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/fuzztest/unregistermissionlistener_fuzzer/BUILD.gn b/test/fuzztest/unregistermissionlistener_fuzzer/BUILD.gn index e3a02ee006..a3041a2d03 100644 --- a/test/fuzztest/unregistermissionlistener_fuzzer/BUILD.gn +++ b/test/fuzztest/unregistermissionlistener_fuzzer/BUILD.gn @@ -38,12 +38,14 @@ ohos_fuzztest("UnRegisterMissionListenerFuzzTest") { "${ability_runtime_services_path}/abilitymgr:abilityms_config", ] - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "c_utils:utils", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/test/fuzztest/wantagenthelperstring_fuzzer/BUILD.gn b/test/fuzztest/wantagenthelperstring_fuzzer/BUILD.gn index 0cbc3231ef..e3a442fbbb 100644 --- a/test/fuzztest/wantagenthelperstring_fuzzer/BUILD.gn +++ b/test/fuzztest/wantagenthelperstring_fuzzer/BUILD.gn @@ -36,11 +36,14 @@ ohos_fuzztest("WantAgentHelperStringFuzzTest") { sources = [ "wantagenthelperstring_fuzzer.cpp" ] + deps = [ + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", + ] + external_deps = [ "ability_base:base", "ability_base:configuration", "ability_base:want", - "ability_runtime:wantagent_innerkits", "c_utils:utils", "common_event_service:cesfwk_innerkits", "ipc:ipc_core", diff --git a/test/fuzztest/wantagenthelpertrigger_fuzzer/BUILD.gn b/test/fuzztest/wantagenthelpertrigger_fuzzer/BUILD.gn index 29c2deb3ff..d908b2ee6f 100644 --- a/test/fuzztest/wantagenthelpertrigger_fuzzer/BUILD.gn +++ b/test/fuzztest/wantagenthelpertrigger_fuzzer/BUILD.gn @@ -36,11 +36,14 @@ ohos_fuzztest("WantAgentHelperTriggerFuzzTest") { sources = [ "wantagenthelpertrigger_fuzzer.cpp" ] + deps = [ + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", + ] + external_deps = [ "ability_base:base", "ability_base:configuration", "ability_base:want", - "ability_runtime:wantagent_innerkits", "c_utils:utils", "common_event_service:cesfwk_innerkits", "ipc:ipc_core", diff --git a/test/moduletest/ability_delegator_test/BUILD.gn b/test/moduletest/ability_delegator_test/BUILD.gn index 4d6378c26b..3543358260 100644 --- a/test/moduletest/ability_delegator_test/BUILD.gn +++ b/test/moduletest/ability_delegator_test/BUILD.gn @@ -113,7 +113,9 @@ ohos_moduletest("ability_delegator_registry_moduletest") { configs += [ "${ability_runtime_services_path}/common:common_config" ] 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:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_delegator", @@ -123,8 +125,6 @@ ohos_moduletest("ability_delegator_registry_moduletest") { external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:runtime", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", @@ -134,8 +134,8 @@ ohos_moduletest("ability_delegator_registry_moduletest") { "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", - "runtime_core:ani", "napi:ace_napi", + "runtime_core:ani", ] } @@ -149,6 +149,7 @@ ohos_moduletest("iability_monitor_moduletest") { configs += [ "${ability_runtime_services_path}/common:common_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_delegator", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -157,7 +158,6 @@ ohos_moduletest("iability_monitor_moduletest") { external_deps = [ "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_manager", "c_utils:utils", "eventhandler:libeventhandler", "googletest:gmock", @@ -165,8 +165,8 @@ ohos_moduletest("iability_monitor_moduletest") { "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", - "runtime_core:ani", "napi:ace_napi", + "runtime_core:ani", ] } @@ -180,6 +180,7 @@ ohos_moduletest("ability_delegator_moduletest") { configs += [ "${ability_runtime_services_path}/common:common_config" ] 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}/appkit:app_context", @@ -190,7 +191,6 @@ ohos_moduletest("ability_delegator_moduletest") { external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", @@ -200,8 +200,8 @@ ohos_moduletest("ability_delegator_moduletest") { "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", - "runtime_core:ani", "napi:ace_napi", + "runtime_core:ani", ] if (ability_runtime_graphics) { @@ -222,7 +222,9 @@ ohos_moduletest("js_test_runner_moduletest") { configs += [ "${ability_runtime_services_path}/common:common_config" ] 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:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_delegator", @@ -234,8 +236,6 @@ ohos_moduletest("js_test_runner_moduletest") { "ability_base:configuration", "ability_base:extractortool", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", @@ -247,8 +247,8 @@ ohos_moduletest("js_test_runner_moduletest") { "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", - "runtime_core:ani", "napi:ace_napi", + "runtime_core:ani", ] } diff --git a/test/moduletest/ability_manager_client_other_test/BUILD.gn b/test/moduletest/ability_manager_client_other_test/BUILD.gn index de396c7797..c08b8884bb 100644 --- a/test/moduletest/ability_manager_client_other_test/BUILD.gn +++ b/test/moduletest/ability_manager_client_other_test/BUILD.gn @@ -29,7 +29,9 @@ ohos_moduletest("ability_manager_client_other_test") { defines = [ "ABILITY_COMMAND_FOR_TEST" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", @@ -38,8 +40,6 @@ ohos_moduletest("ability_manager_client_other_test") { external_deps = [ "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/moduletest/ability_manager_client_test/BUILD.gn b/test/moduletest/ability_manager_client_test/BUILD.gn index 4219cde131..adaccccef8 100644 --- a/test/moduletest/ability_manager_client_test/BUILD.gn +++ b/test/moduletest/ability_manager_client_test/BUILD.gn @@ -32,14 +32,14 @@ ohos_moduletest("ability_manager_client_test") { defines = [] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", ] external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/moduletest/ability_record_test/BUILD.gn b/test/moduletest/ability_record_test/BUILD.gn index 78a5d3bd0e..575f91c2a6 100644 --- a/test/moduletest/ability_record_test/BUILD.gn +++ b/test/moduletest/ability_record_test/BUILD.gn @@ -39,6 +39,7 @@ ohos_moduletest("AbilityRecordModuleTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -51,7 +52,6 @@ ohos_moduletest("AbilityRecordModuleTest") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/moduletest/ability_test/BUILD.gn b/test/moduletest/ability_test/BUILD.gn index 35b8e62ee9..22b23d69be 100644 --- a/test/moduletest/ability_test/BUILD.gn +++ b/test/moduletest/ability_test/BUILD.gn @@ -173,6 +173,7 @@ ohos_moduletest("ability_thread_call_request_module_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_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}/ability/native:abilitykit_utils", @@ -183,7 +184,6 @@ ohos_moduletest("ability_thread_call_request_module_test") { "ability_base:configuration", "ability_base:want", "ability_base:zuri", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/moduletest/app_mgr_client_test/BUILD.gn b/test/moduletest/app_mgr_client_test/BUILD.gn index 9a3c1e9e3e..d35bbfc774 100644 --- a/test/moduletest/app_mgr_client_test/BUILD.gn +++ b/test/moduletest/app_mgr_client_test/BUILD.gn @@ -33,6 +33,8 @@ ohos_moduletest("app_mgr_client_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", ] @@ -40,8 +42,6 @@ ohos_moduletest("app_mgr_client_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/moduletest/common/ams/BUILD.gn b/test/moduletest/common/ams/BUILD.gn index 1ca2625d8a..814b65be62 100644 --- a/test/moduletest/common/ams/BUILD.gn +++ b/test/moduletest/common/ams/BUILD.gn @@ -38,6 +38,7 @@ ohos_source_set("appmgr_mst_source") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:task_handler_wrap", @@ -51,7 +52,6 @@ ohos_source_set("appmgr_mst_source") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "appspawn:appspawn_client", "common_event_service:cesfwk_core", diff --git a/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn b/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn index ee9e6b22bd..c299e4b489 100644 --- a/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn +++ b/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn @@ -56,7 +56,6 @@ ohos_moduletest("specified_ability_service_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/moduletest/ipc_ability_connect_test/BUILD.gn b/test/moduletest/ipc_ability_connect_test/BUILD.gn index d6c1ab8b6d..99746abfbf 100644 --- a/test/moduletest/ipc_ability_connect_test/BUILD.gn +++ b/test/moduletest/ipc_ability_connect_test/BUILD.gn @@ -29,6 +29,7 @@ ohos_moduletest("IpcAbilityConnectModuleTest") { } deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/appkit:app_context_utils", "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -37,7 +38,6 @@ ohos_moduletest("IpcAbilityConnectModuleTest") { external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", "c_utils:utils", "googletest:gmock_main", "googletest:gtest_main", diff --git a/test/moduletest/ipc_ability_scheduler_test/BUILD.gn b/test/moduletest/ipc_ability_scheduler_test/BUILD.gn index 506d4176fe..67ffcec52c 100644 --- a/test/moduletest/ipc_ability_scheduler_test/BUILD.gn +++ b/test/moduletest/ipc_ability_scheduler_test/BUILD.gn @@ -30,6 +30,7 @@ ohos_moduletest("IpcAbilitySchedulerModuleTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -42,7 +43,6 @@ ohos_moduletest("IpcAbilitySchedulerModuleTest") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "bundle_framework:appexecfwk_core", "c_utils:utils", "googletest:gmock_main", diff --git a/test/moduletest/quick_fix/quick_fix_manager_module_test/BUILD.gn b/test/moduletest/quick_fix/quick_fix_manager_module_test/BUILD.gn index a81da9d445..ee5242505d 100644 --- a/test/moduletest/quick_fix/quick_fix_manager_module_test/BUILD.gn +++ b/test/moduletest/quick_fix/quick_fix_manager_module_test/BUILD.gn @@ -40,15 +40,15 @@ ohos_moduletest("quick_fix_manager_module_test") { } deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/quick_fix:quickfix_manager", + "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/quickfixmgr:quickfixms_static", ] external_deps = [ "ability_base:want", - "ability_runtime:abilitykit_native", - "ability_runtime:app_manager", - "ability_runtime:quickfix_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/moduletest/ui_extension_ability_test/ui_extension_info_module_test/BUILD.gn b/test/moduletest/ui_extension_ability_test/ui_extension_info_module_test/BUILD.gn index dac5c26221..a1bbe3b0d5 100644 --- a/test/moduletest/ui_extension_ability_test/ui_extension_info_module_test/BUILD.gn +++ b/test/moduletest/ui_extension_ability_test/ui_extension_info_module_test/BUILD.gn @@ -29,14 +29,14 @@ ohos_moduletest("ui_extension_info_module_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_path}/utils/global/common:runtime_utils", ] external_deps = [ "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/ability_auto_startup_data_manager_test/BUILD.gn b/test/unittest/ability_auto_startup_data_manager_test/BUILD.gn index 0d543bebad..6e2ad97aaa 100644 --- a/test/unittest/ability_auto_startup_data_manager_test/BUILD.gn +++ b/test/unittest/ability_auto_startup_data_manager_test/BUILD.gn @@ -50,12 +50,11 @@ ohos_unittest("ability_auto_startup_data_manager_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", - "c_utils:utils", "cJSON:cjson", + "c_utils:utils", "common_event_service:cesfwk_innerkits", "ffrt:libffrt", "googletest:gtest_main", diff --git a/test/unittest/ability_auto_startup_service_second_test/BUILD.gn b/test/unittest/ability_auto_startup_service_second_test/BUILD.gn index 836ba9844f..6a36cdd42f 100644 --- a/test/unittest/ability_auto_startup_service_second_test/BUILD.gn +++ b/test/unittest/ability_auto_startup_service_second_test/BUILD.gn @@ -62,7 +62,6 @@ ohos_unittest("ability_auto_startup_service_second_test") { external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/ability_auto_startup_service_test/BUILD.gn b/test/unittest/ability_auto_startup_service_test/BUILD.gn index ee045c7add..4b6a9e04f4 100644 --- a/test/unittest/ability_auto_startup_service_test/BUILD.gn +++ b/test/unittest/ability_auto_startup_service_test/BUILD.gn @@ -47,8 +47,8 @@ ohos_unittest("ability_auto_startup_service_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", - "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:auto_startup_callback", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", @@ -59,7 +59,6 @@ ohos_unittest("ability_auto_startup_service_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/ability_background_connection_test/BUILD.gn b/test/unittest/ability_background_connection_test/BUILD.gn index b9443976ba..92d1d9c664 100644 --- a/test/unittest/ability_background_connection_test/BUILD.gn +++ b/test/unittest/ability_background_connection_test/BUILD.gn @@ -41,6 +41,7 @@ ohos_unittest("ability_background_connection_test") { configs = [ "${ability_runtime_test_path}/mock/services_abilitymgr_test:aafwk_mock_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", @@ -55,7 +56,6 @@ ohos_unittest("ability_background_connection_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/ability_bundle_event_callback_test/BUILD.gn b/test/unittest/ability_bundle_event_callback_test/BUILD.gn index ff8f9b8144..b4e957e83c 100644 --- a/test/unittest/ability_bundle_event_callback_test/BUILD.gn +++ b/test/unittest/ability_bundle_event_callback_test/BUILD.gn @@ -48,6 +48,7 @@ ohos_unittest("ability_bundle_event_callback_test") { configs = [ "${ability_runtime_test_path}/mock/services_abilitymgr_test:aafwk_mock_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", @@ -63,7 +64,6 @@ ohos_unittest("ability_bundle_event_callback_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/ability_cache_manager_test/BUILD.gn b/test/unittest/ability_cache_manager_test/BUILD.gn index dc664ec721..bb75a9fe35 100644 --- a/test/unittest/ability_cache_manager_test/BUILD.gn +++ b/test/unittest/ability_cache_manager_test/BUILD.gn @@ -44,6 +44,8 @@ ohos_unittest("ability_cache_manager_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } 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_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", @@ -56,8 +58,6 @@ ohos_unittest("ability_cache_manager_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/ability_connect_callback_proxy_test/BUILD.gn b/test/unittest/ability_connect_callback_proxy_test/BUILD.gn index 97ebce2a47..e21a8de939 100644 --- a/test/unittest/ability_connect_callback_proxy_test/BUILD.gn +++ b/test/unittest/ability_connect_callback_proxy_test/BUILD.gn @@ -36,6 +36,7 @@ ohos_unittest("ability_connect_callback_proxy_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_native_path}/appkit:app_context_utils", "${ability_runtime_path}/services/abilitymgr:abilityms_target", @@ -49,7 +50,6 @@ ohos_unittest("ability_connect_callback_proxy_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/ability_connect_callback_stub_test/BUILD.gn b/test/unittest/ability_connect_callback_stub_test/BUILD.gn index fe678dfe76..9f1a27922c 100644 --- a/test/unittest/ability_connect_callback_stub_test/BUILD.gn +++ b/test/unittest/ability_connect_callback_stub_test/BUILD.gn @@ -36,6 +36,7 @@ ohos_unittest("ability_connect_callback_stub_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_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", @@ -47,7 +48,6 @@ ohos_unittest("ability_connect_callback_stub_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", @@ -89,6 +89,7 @@ ohos_unittest("ability_connect_callback_recipient_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}/services/abilitymgr:abilityms_target", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -101,7 +102,6 @@ ohos_unittest("ability_connect_callback_recipient_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/ability_connect_manager_first_test/BUILD.gn b/test/unittest/ability_connect_manager_first_test/BUILD.gn index b3d881b5b2..7ec80cd3b7 100644 --- a/test/unittest/ability_connect_manager_first_test/BUILD.gn +++ b/test/unittest/ability_connect_manager_first_test/BUILD.gn @@ -51,6 +51,8 @@ ohos_unittest("ability_connect_manager_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}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", @@ -63,8 +65,6 @@ ohos_unittest("ability_connect_manager_first_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/ability_connect_manager_fourth_test/BUILD.gn b/test/unittest/ability_connect_manager_fourth_test/BUILD.gn index a2d543b919..84a911e617 100644 --- a/test/unittest/ability_connect_manager_fourth_test/BUILD.gn +++ b/test/unittest/ability_connect_manager_fourth_test/BUILD.gn @@ -50,6 +50,8 @@ ohos_unittest("ability_connect_manager_fourth_test") { } deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${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_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", @@ -62,8 +64,6 @@ ohos_unittest("ability_connect_manager_fourth_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/ability_connect_manager_second_test/BUILD.gn b/test/unittest/ability_connect_manager_second_test/BUILD.gn index a3c64d5ba1..4b9b594cde 100644 --- a/test/unittest/ability_connect_manager_second_test/BUILD.gn +++ b/test/unittest/ability_connect_manager_second_test/BUILD.gn @@ -43,6 +43,8 @@ ohos_unittest("ability_connect_manager_second_test") { "-Dprotected=public", ] 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_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", @@ -55,8 +57,6 @@ ohos_unittest("ability_connect_manager_second_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/ability_connect_manager_test/BUILD.gn b/test/unittest/ability_connect_manager_test/BUILD.gn index 2e3b5d42c2..bb49dd620c 100644 --- a/test/unittest/ability_connect_manager_test/BUILD.gn +++ b/test/unittest/ability_connect_manager_test/BUILD.gn @@ -50,11 +50,13 @@ ohos_unittest("ability_connect_manager_test") { } deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${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_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", - "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", @@ -63,8 +65,6 @@ ohos_unittest("ability_connect_manager_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/ability_connection_test/BUILD.gn b/test/unittest/ability_connection_test/BUILD.gn index 9ab1cdfa30..c7ac51715a 100644 --- a/test/unittest/ability_connection_test/BUILD.gn +++ b/test/unittest/ability_connection_test/BUILD.gn @@ -27,13 +27,13 @@ ohos_unittest("ability_connection_test") { 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", ] external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:runtime", "c_utils:utils", "googletest:gmock_main", "googletest:gtest_main", diff --git a/test/unittest/ability_extension_base_test/BUILD.gn b/test/unittest/ability_extension_base_test/BUILD.gn index 2ea482baa4..93e6a87b7e 100644 --- a/test/unittest/ability_extension_base_test/BUILD.gn +++ b/test/unittest/ability_extension_base_test/BUILD.gn @@ -35,6 +35,7 @@ ohos_unittest("ability_extension_base_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${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", @@ -45,7 +46,6 @@ ohos_unittest("ability_extension_base_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/ability_extension_context_test/BUILD.gn b/test/unittest/ability_extension_context_test/BUILD.gn index 47d3935421..efcea92a13 100644 --- a/test/unittest/ability_extension_context_test/BUILD.gn +++ b/test/unittest/ability_extension_context_test/BUILD.gn @@ -34,6 +34,7 @@ ohos_unittest("ability_extension_context_test") { } deps = [ + "${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", @@ -44,7 +45,6 @@ ohos_unittest("ability_extension_context_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/ability_extension_module_loader_test/BUILD.gn b/test/unittest/ability_extension_module_loader_test/BUILD.gn index 4a81c8017d..c8abc7d21b 100644 --- a/test/unittest/ability_extension_module_loader_test/BUILD.gn +++ b/test/unittest/ability_extension_module_loader_test/BUILD.gn @@ -45,7 +45,6 @@ ohos_unittest("ability_extension_module_loader_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "c_utils:utils", "googletest:gmock_main", diff --git a/test/unittest/ability_first_frame_state_observer_manager_test/BUILD.gn b/test/unittest/ability_first_frame_state_observer_manager_test/BUILD.gn index 82c99d3740..e83be7182a 100644 --- a/test/unittest/ability_first_frame_state_observer_manager_test/BUILD.gn +++ b/test/unittest/ability_first_frame_state_observer_manager_test/BUILD.gn @@ -41,7 +41,6 @@ ohos_unittest("ability_first_frame_state_observer_manager_test") { external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/ability_interceptor_second_test/BUILD.gn b/test/unittest/ability_interceptor_second_test/BUILD.gn index 1e77c1e00a..0ffe2ad4f3 100644 --- a/test/unittest/ability_interceptor_second_test/BUILD.gn +++ b/test/unittest/ability_interceptor_second_test/BUILD.gn @@ -46,6 +46,7 @@ ohos_unittest("ability_interceptor_second_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -60,7 +61,6 @@ ohos_unittest("ability_interceptor_second_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", diff --git a/test/unittest/ability_interceptor_test/BUILD.gn b/test/unittest/ability_interceptor_test/BUILD.gn index 64395e7d8b..5e8e5abae0 100644 --- a/test/unittest/ability_interceptor_test/BUILD.gn +++ b/test/unittest/ability_interceptor_test/BUILD.gn @@ -46,6 +46,7 @@ ohos_unittest("ability_interceptor_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -60,7 +61,6 @@ ohos_unittest("ability_interceptor_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", diff --git a/test/unittest/ability_interceptor_third_test/BUILD.gn b/test/unittest/ability_interceptor_third_test/BUILD.gn index c8e2abff92..980c5840e8 100644 --- a/test/unittest/ability_interceptor_third_test/BUILD.gn +++ b/test/unittest/ability_interceptor_third_test/BUILD.gn @@ -47,6 +47,7 @@ ohos_unittest("ability_interceptor_third_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -62,7 +63,6 @@ ohos_unittest("ability_interceptor_third_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "c_utils:utils", "common_event_service:cesfwk_innerkits", "ffrt:libffrt", diff --git a/test/unittest/ability_keep_alive_data_manager_second_test/BUILD.gn b/test/unittest/ability_keep_alive_data_manager_second_test/BUILD.gn index 9c9fe8b432..63dd3ca066 100644 --- a/test/unittest/ability_keep_alive_data_manager_second_test/BUILD.gn +++ b/test/unittest/ability_keep_alive_data_manager_second_test/BUILD.gn @@ -49,7 +49,6 @@ ohos_unittest("ability_keep_alive_data_manager_second_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/ability_keep_alive_data_manager_test/BUILD.gn b/test/unittest/ability_keep_alive_data_manager_test/BUILD.gn index aa66d08332..7bae7e8f16 100644 --- a/test/unittest/ability_keep_alive_data_manager_test/BUILD.gn +++ b/test/unittest/ability_keep_alive_data_manager_test/BUILD.gn @@ -48,7 +48,6 @@ ohos_unittest("ability_keep_alive_data_manager_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/ability_keep_alive_service_test/BUILD.gn b/test/unittest/ability_keep_alive_service_test/BUILD.gn index 24437fa828..5dd8333765 100644 --- a/test/unittest/ability_keep_alive_service_test/BUILD.gn +++ b/test/unittest/ability_keep_alive_service_test/BUILD.gn @@ -50,7 +50,6 @@ ohos_unittest("ability_keep_alive_service_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/ability_manager_client_branch_second_test/BUILD.gn b/test/unittest/ability_manager_client_branch_second_test/BUILD.gn index b148decdea..e0bf190629 100644 --- a/test/unittest/ability_manager_client_branch_second_test/BUILD.gn +++ b/test/unittest/ability_manager_client_branch_second_test/BUILD.gn @@ -53,7 +53,6 @@ ohos_unittest("ability_manager_client_branch_second_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/unittest/ability_manager_client_branch_test/BUILD.gn b/test/unittest/ability_manager_client_branch_test/BUILD.gn index 2839844172..0fdef420d9 100644 --- a/test/unittest/ability_manager_client_branch_test/BUILD.gn +++ b/test/unittest/ability_manager_client_branch_test/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("ability_manager_client_branch_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/unittest/ability_manager_client_branch_third_test/BUILD.gn b/test/unittest/ability_manager_client_branch_third_test/BUILD.gn index 79c012ee15..d978d28dc7 100644 --- a/test/unittest/ability_manager_client_branch_third_test/BUILD.gn +++ b/test/unittest/ability_manager_client_branch_third_test/BUILD.gn @@ -58,7 +58,6 @@ ohos_unittest("ability_manager_client_branch_third_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/unittest/ability_manager_event_subscriber_test/BUILD.gn b/test/unittest/ability_manager_event_subscriber_test/BUILD.gn index a3a5fe1859..09e98b5ff0 100644 --- a/test/unittest/ability_manager_event_subscriber_test/BUILD.gn +++ b/test/unittest/ability_manager_event_subscriber_test/BUILD.gn @@ -41,6 +41,7 @@ ohos_unittest("ability_manager_event_subscriber_test") { configs = [ "${ability_runtime_test_path}/mock/services_abilitymgr_test:aafwk_mock_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", @@ -56,7 +57,6 @@ ohos_unittest("ability_manager_event_subscriber_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/ability_manager_proxy_fifth_test/BUILD.gn b/test/unittest/ability_manager_proxy_fifth_test/BUILD.gn index f41b866786..33751c5377 100644 --- a/test/unittest/ability_manager_proxy_fifth_test/BUILD.gn +++ b/test/unittest/ability_manager_proxy_fifth_test/BUILD.gn @@ -38,7 +38,9 @@ ohos_unittest("ability_manager_proxy_fifth_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", @@ -47,8 +49,6 @@ ohos_unittest("ability_manager_proxy_fifth_test") { external_deps = [ "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/ability_manager_proxy_fourth_test/BUILD.gn b/test/unittest/ability_manager_proxy_fourth_test/BUILD.gn index 359ca34f2b..2da3f2a974 100644 --- a/test/unittest/ability_manager_proxy_fourth_test/BUILD.gn +++ b/test/unittest/ability_manager_proxy_fourth_test/BUILD.gn @@ -51,7 +51,9 @@ ohos_unittest("ability_manager_proxy_fourth_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}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", @@ -63,8 +65,6 @@ ohos_unittest("ability_manager_proxy_fourth_test") { external_deps = [ "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", @@ -72,11 +72,11 @@ ohos_unittest("ability_manager_proxy_fourth_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", + "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", - "hisysevent:libhisysevent", "window_manager:session_manager_lite", ] diff --git a/test/unittest/ability_manager_proxy_second_test/BUILD.gn b/test/unittest/ability_manager_proxy_second_test/BUILD.gn index 75dbc33eb9..3d141989af 100644 --- a/test/unittest/ability_manager_proxy_second_test/BUILD.gn +++ b/test/unittest/ability_manager_proxy_second_test/BUILD.gn @@ -49,7 +49,9 @@ ohos_unittest("ability_manager_proxy_second_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", @@ -61,8 +63,6 @@ ohos_unittest("ability_manager_proxy_second_test") { external_deps = [ "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/ability_manager_proxy_sixth_test/BUILD.gn b/test/unittest/ability_manager_proxy_sixth_test/BUILD.gn index 3e2313dd1f..7d44ae9015 100644 --- a/test/unittest/ability_manager_proxy_sixth_test/BUILD.gn +++ b/test/unittest/ability_manager_proxy_sixth_test/BUILD.gn @@ -46,7 +46,9 @@ ohos_unittest("ability_manager_proxy_sixth_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -60,8 +62,6 @@ ohos_unittest("ability_manager_proxy_sixth_test") { external_deps = [ "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/ability_manager_proxy_test/BUILD.gn b/test/unittest/ability_manager_proxy_test/BUILD.gn index 21843cdcb2..59b5762b6b 100644 --- a/test/unittest/ability_manager_proxy_test/BUILD.gn +++ b/test/unittest/ability_manager_proxy_test/BUILD.gn @@ -44,7 +44,9 @@ ohos_unittest("ability_manager_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:mission_info", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", @@ -56,8 +58,6 @@ ohos_unittest("ability_manager_proxy_test") { external_deps = [ "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/ability_manager_proxy_third_test/BUILD.gn b/test/unittest/ability_manager_proxy_third_test/BUILD.gn index 0d9b9756c8..5875173ca2 100644 --- a/test/unittest/ability_manager_proxy_third_test/BUILD.gn +++ b/test/unittest/ability_manager_proxy_third_test/BUILD.gn @@ -48,7 +48,9 @@ ohos_unittest("ability_manager_proxy_third_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", @@ -60,8 +62,6 @@ ohos_unittest("ability_manager_proxy_third_test") { external_deps = [ "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/ability_manager_service_dialog_test/BUILD.gn b/test/unittest/ability_manager_service_dialog_test/BUILD.gn index 199946f618..89953b4916 100644 --- a/test/unittest/ability_manager_service_dialog_test/BUILD.gn +++ b/test/unittest/ability_manager_service_dialog_test/BUILD.gn @@ -25,11 +25,13 @@ ohos_unittest("ability_manager_service_dialog_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] - deps = [ "${ability_runtime_services_path}/abilitymgr:abilityms" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_services_path}/abilitymgr:abilityms", + ] external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/ability_manager_service_eighth_test/BUILD.gn b/test/unittest/ability_manager_service_eighth_test/BUILD.gn index 4b7bc8f1b2..19b80db427 100644 --- a/test/unittest/ability_manager_service_eighth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_eighth_test/BUILD.gn @@ -52,6 +52,7 @@ ohos_unittest("ability_manager_service_eighth_test") { ] deps = [ + "${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", "${ability_runtime_innerkits_path}/app_manager:app_manager", @@ -67,7 +68,6 @@ ohos_unittest("ability_manager_service_eighth_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/ability_manager_service_eleven_test/BUILD.gn b/test/unittest/ability_manager_service_eleven_test/BUILD.gn index bf16ffda3f..7842710321 100644 --- a/test/unittest/ability_manager_service_eleven_test/BUILD.gn +++ b/test/unittest/ability_manager_service_eleven_test/BUILD.gn @@ -67,6 +67,7 @@ ohos_unittest("ability_manager_service_eleven_test") { ] deps = [ + "${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", "${ability_runtime_innerkits_path}/app_manager:app_manager", @@ -88,7 +89,6 @@ ohos_unittest("ability_manager_service_eleven_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/ability_manager_service_ninth_test/BUILD.gn b/test/unittest/ability_manager_service_ninth_test/BUILD.gn index fec6f4c3ff..ce377c76f7 100644 --- a/test/unittest/ability_manager_service_ninth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_ninth_test/BUILD.gn @@ -54,6 +54,7 @@ ohos_unittest("ability_manager_service_ninth_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] deps = [ + "${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", "${ability_runtime_innerkits_path}/app_manager:app_manager", @@ -69,7 +70,6 @@ ohos_unittest("ability_manager_service_ninth_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/ability_manager_stub_second_test/BUILD.gn b/test/unittest/ability_manager_stub_second_test/BUILD.gn index b69275d0ac..a9652e4753 100644 --- a/test/unittest/ability_manager_stub_second_test/BUILD.gn +++ b/test/unittest/ability_manager_stub_second_test/BUILD.gn @@ -48,6 +48,7 @@ ohos_unittest("ability_manager_stub_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:mission_info", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -60,7 +61,6 @@ ohos_unittest("ability_manager_stub_second_test") { external_deps = [ "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/ability_manager_stub_test/BUILD.gn b/test/unittest/ability_manager_stub_test/BUILD.gn index b4a7c9c9a6..8c84e88efe 100644 --- a/test/unittest/ability_manager_stub_test/BUILD.gn +++ b/test/unittest/ability_manager_stub_test/BUILD.gn @@ -48,6 +48,7 @@ ohos_unittest("ability_manager_stub_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_native_path}/ability/native:abilitykit_native", @@ -62,7 +63,6 @@ ohos_unittest("ability_manager_stub_test") { external_deps = [ "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/ability_permission_util_second_test/BUILD.gn b/test/unittest/ability_permission_util_second_test/BUILD.gn index 2fa07cdee7..52ed3f07ba 100644 --- a/test/unittest/ability_permission_util_second_test/BUILD.gn +++ b/test/unittest/ability_permission_util_second_test/BUILD.gn @@ -53,6 +53,7 @@ ohos_unittest("ability_permission_util_second_test") { deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", ] @@ -62,7 +63,6 @@ ohos_unittest("ability_permission_util_second_test") { "ability_base:configuration", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "appspawn:appspawn_client", "bundle_framework:appexecfwk_base", diff --git a/test/unittest/ability_permission_util_test/BUILD.gn b/test/unittest/ability_permission_util_test/BUILD.gn index f3e539608b..f132df3302 100644 --- a/test/unittest/ability_permission_util_test/BUILD.gn +++ b/test/unittest/ability_permission_util_test/BUILD.gn @@ -55,6 +55,7 @@ ohos_unittest("ability_permission_util_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_services_path}/common:app_util", ] @@ -63,7 +64,6 @@ ohos_unittest("ability_permission_util_test") { "ability_base:configuration", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "appspawn:appspawn_client", "bundle_framework:appexecfwk_base", diff --git a/test/unittest/ability_record_dump_test/BUILD.gn b/test/unittest/ability_record_dump_test/BUILD.gn index 899ae3c514..69c0b28e2a 100644 --- a/test/unittest/ability_record_dump_test/BUILD.gn +++ b/test/unittest/ability_record_dump_test/BUILD.gn @@ -23,12 +23,14 @@ ohos_unittest("ability_record_dump_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] - deps = [ "${ability_runtime_services_path}/abilitymgr:abilityms" ] + deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_services_path}/abilitymgr:abilityms", + ] external_deps = [ "ability_base:session_info", "ability_base:want", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/ability_record_mgr_test/BUILD.gn b/test/unittest/ability_record_mgr_test/BUILD.gn index cde48716a2..3bf697f1d1 100644 --- a/test/unittest/ability_record_mgr_test/BUILD.gn +++ b/test/unittest/ability_record_mgr_test/BUILD.gn @@ -38,10 +38,12 @@ ohos_unittest("ability_record_mgr_test") { if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "${ability_runtime_native_path}/ability/native:abilitykit_utils" ] + deps = [ + "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability/native:abilitykit_utils", + ] external_deps = [ - "ability_runtime:abilitykit_native", "bundle_framework:appexecfwk_base", "c_utils:utils", "eventhandler:libeventhandler", diff --git a/test/unittest/ability_record_test/BUILD.gn b/test/unittest/ability_record_test/BUILD.gn index e5b28d580d..127c3c2dc2 100644 --- a/test/unittest/ability_record_test/BUILD.gn +++ b/test/unittest/ability_record_test/BUILD.gn @@ -52,6 +52,7 @@ ohos_unittest("ability_record_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_innerkits_path}/ability_manager:process_options", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_path}/utils/global/common:runtime_utils", @@ -71,7 +72,6 @@ ohos_unittest("ability_record_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", diff --git a/test/unittest/ability_scheduler_proxy_test/BUILD.gn b/test/unittest/ability_scheduler_proxy_test/BUILD.gn index 10df582bc8..13c59edf0d 100644 --- a/test/unittest/ability_scheduler_proxy_test/BUILD.gn +++ b/test/unittest/ability_scheduler_proxy_test/BUILD.gn @@ -44,6 +44,7 @@ ohos_unittest("ability_scheduler_proxy_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", @@ -56,7 +57,6 @@ ohos_unittest("ability_scheduler_proxy_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/ability_scheduler_stub_second_test/BUILD.gn b/test/unittest/ability_scheduler_stub_second_test/BUILD.gn index 7e08e63c5f..9d281f3e11 100644 --- a/test/unittest/ability_scheduler_stub_second_test/BUILD.gn +++ b/test/unittest/ability_scheduler_stub_second_test/BUILD.gn @@ -38,6 +38,7 @@ ohos_unittest("ability_scheduler_stub_second_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/dataobs_manager:dataobs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/common:perm_verification", @@ -50,7 +51,6 @@ ohos_unittest("ability_scheduler_stub_second_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/ability_scheduler_stub_test/BUILD.gn b/test/unittest/ability_scheduler_stub_test/BUILD.gn index 3d1f5b6668..30363c4ee8 100644 --- a/test/unittest/ability_scheduler_stub_test/BUILD.gn +++ b/test/unittest/ability_scheduler_stub_test/BUILD.gn @@ -35,6 +35,7 @@ ohos_unittest("ability_scheduler_stub_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", @@ -46,7 +47,6 @@ ohos_unittest("ability_scheduler_stub_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/ability_service_extension_test/BUILD.gn b/test/unittest/ability_service_extension_test/BUILD.gn index 8d3de99faf..87f3e3f725 100644 --- a/test/unittest/ability_service_extension_test/BUILD.gn +++ b/test/unittest/ability_service_extension_test/BUILD.gn @@ -45,24 +45,24 @@ ohos_unittest("ability_service_extension_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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:abilitykit_utils", "${ability_runtime_native_path}/ability/native:configuration_helper", "${ability_runtime_native_path}/ability/native:service_extension", "${ability_runtime_native_path}/appkit:app_context", - "${ability_runtime_native_path}/appkit:application_image_observer_manager", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/appkit:application_image_observer_manager", ] external_deps = [ "ability_base:base", "ability_base:configuration", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:abilitykit_native", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -72,8 +72,8 @@ ohos_unittest("ability_service_extension_test") { "form_fwk:fmskit_native", "googletest:gmock_main", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", diff --git a/test/unittest/ability_start_window_option_test/BUILD.gn b/test/unittest/ability_start_window_option_test/BUILD.gn index 6eed69aa6c..47c6ddcd5e 100644 --- a/test/unittest/ability_start_window_option_test/BUILD.gn +++ b/test/unittest/ability_start_window_option_test/BUILD.gn @@ -43,7 +43,6 @@ ohos_unittest("ability_start_window_option_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/ability_start_with_wait_observer_manager/BUILD.gn b/test/unittest/ability_start_with_wait_observer_manager/BUILD.gn index 4cbfe7e187..dd53841138 100644 --- a/test/unittest/ability_start_with_wait_observer_manager/BUILD.gn +++ b/test/unittest/ability_start_with_wait_observer_manager/BUILD.gn @@ -44,6 +44,8 @@ ohos_unittest("ability_start_with_wait_observer_manager") { ] 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}/appkit:appkit_native", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -56,8 +58,6 @@ ohos_unittest("ability_start_with_wait_observer_manager") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/acquire_share_data_callback_proxy_test/BUILD.gn b/test/unittest/acquire_share_data_callback_proxy_test/BUILD.gn index 785afd6bcb..dc05a873e0 100644 --- a/test/unittest/acquire_share_data_callback_proxy_test/BUILD.gn +++ b/test/unittest/acquire_share_data_callback_proxy_test/BUILD.gn @@ -33,8 +33,11 @@ ohos_unittest("acquire_share_data_callback_proxy_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + ] + external_deps = [ - "ability_runtime:ability_manager", "c_utils:utils", "ffrt:libffrt", "ipc:ipc_core", diff --git a/test/unittest/ag_convert_callback_impl_test/BUILD.gn b/test/unittest/ag_convert_callback_impl_test/BUILD.gn index 43ceb9fa16..d04df8528b 100644 --- a/test/unittest/ag_convert_callback_impl_test/BUILD.gn +++ b/test/unittest/ag_convert_callback_impl_test/BUILD.gn @@ -42,6 +42,7 @@ ohos_unittest("ag_convert_callback_impl_test") { configs = [ "${ability_runtime_test_path}/mock/services_abilitymgr_test:aafwk_mock_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/appkit:appkit_manager_helper", @@ -56,7 +57,6 @@ ohos_unittest("ag_convert_callback_impl_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "app_domain_verify:app_domain_verify_common", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/ams_app_death_recipient_test/BUILD.gn b/test/unittest/ams_app_death_recipient_test/BUILD.gn index 596c1cc6c8..02d0cea880 100644 --- a/test/unittest/ams_app_death_recipient_test/BUILD.gn +++ b/test/unittest/ams_app_death_recipient_test/BUILD.gn @@ -37,6 +37,7 @@ ohos_unittest("AppDeathRecipientTest") { } deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/appmgr:libappms", @@ -49,7 +50,6 @@ ohos_unittest("AppDeathRecipientTest") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "appspawn:appspawn_client", "bundle_framework:appexecfwk_base", diff --git a/test/unittest/ams_mgr_proxy_test/BUILD.gn b/test/unittest/ams_mgr_proxy_test/BUILD.gn index 97ea0ca6f6..ac1b2fdb9b 100644 --- a/test/unittest/ams_mgr_proxy_test/BUILD.gn +++ b/test/unittest/ams_mgr_proxy_test/BUILD.gn @@ -33,6 +33,7 @@ ohos_unittest("AmsMgrProxyTest") { sources = [ "ams_mgr_proxy_test.cpp" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:task_handler_wrap", @@ -41,7 +42,6 @@ ohos_unittest("AmsMgrProxyTest") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "appspawn:appspawn_client", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/ams_mgr_stub_test/BUILD.gn b/test/unittest/ams_mgr_stub_test/BUILD.gn index a2593b61cb..f455a4e72d 100644 --- a/test/unittest/ams_mgr_stub_test/BUILD.gn +++ b/test/unittest/ams_mgr_stub_test/BUILD.gn @@ -32,6 +32,7 @@ ohos_unittest("AmsMgrStubTest") { sources = [ "ams_mgr_stub_test.cpp" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:task_handler_wrap", @@ -39,7 +40,6 @@ ohos_unittest("AmsMgrStubTest") { external_deps = [ "ability_base:want", - "ability_runtime:app_manager", "appspawn:appspawn_client", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/ams_service_load_ability_process_test/BUILD.gn b/test/unittest/ams_service_load_ability_process_test/BUILD.gn index 00db4f8e8e..80dc26dfca 100644 --- a/test/unittest/ams_service_load_ability_process_test/BUILD.gn +++ b/test/unittest/ams_service_load_ability_process_test/BUILD.gn @@ -71,6 +71,7 @@ ohos_unittest("AmsServiceLoadAbilityProcessTest") { } deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/global/common:runtime_utils", "${ability_runtime_path}/utils/global/freeze:freeze_util", @@ -85,7 +86,6 @@ ohos_unittest("AmsServiceLoadAbilityProcessTest") { external_deps = [ "ability_base:want", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "appspawn:appspawn_client", "bundle_framework:appexecfwk_base", @@ -105,6 +105,7 @@ ohos_unittest("AmsServiceLoadAbilityProcessTest") { "init:libbegetutil", "ipc:ipc_core", "ipc:ipc_single", + "json:nlohmann_json_static", "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", "memmgr:memmgrclient", @@ -113,7 +114,6 @@ ohos_unittest("AmsServiceLoadAbilityProcessTest") { "resource_schedule_service:ressched_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", - "json:nlohmann_json_static", "window_manager:session_manager_lite", ] diff --git a/test/unittest/app_exit_reason_helper_fourth_test/BUILD.gn b/test/unittest/app_exit_reason_helper_fourth_test/BUILD.gn index f950a83fcd..41859ab820 100644 --- a/test/unittest/app_exit_reason_helper_fourth_test/BUILD.gn +++ b/test/unittest/app_exit_reason_helper_fourth_test/BUILD.gn @@ -63,6 +63,7 @@ ohos_unittest("app_exit_reason_helper_fourth_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_path}/utils/global/common:runtime_utils", "${ability_runtime_path}/utils/global/freeze:freeze_util", @@ -78,7 +79,6 @@ ohos_unittest("app_exit_reason_helper_fourth_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/app_exit_reason_helper_second_test/BUILD.gn b/test/unittest/app_exit_reason_helper_second_test/BUILD.gn index 1c9daf8f66..b3306dcbae 100644 --- a/test/unittest/app_exit_reason_helper_second_test/BUILD.gn +++ b/test/unittest/app_exit_reason_helper_second_test/BUILD.gn @@ -53,6 +53,7 @@ ohos_unittest("app_exit_reason_helper_second_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/global/common:runtime_utils", "${ability_runtime_path}/utils/global/freeze:freeze_util", @@ -67,7 +68,6 @@ ohos_unittest("app_exit_reason_helper_second_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "c_utils:utils", "eventhandler:libeventhandler", diff --git a/test/unittest/app_exit_reason_helper_third_test/BUILD.gn b/test/unittest/app_exit_reason_helper_third_test/BUILD.gn index 7bfaeacf44..a349a622af 100644 --- a/test/unittest/app_exit_reason_helper_third_test/BUILD.gn +++ b/test/unittest/app_exit_reason_helper_third_test/BUILD.gn @@ -59,6 +59,7 @@ ohos_unittest("app_exit_reason_helper_third_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/global/common:runtime_utils", "${ability_runtime_path}/utils/global/freeze:freeze_util", @@ -74,8 +75,6 @@ ohos_unittest("app_exit_reason_helper_third_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "eventhandler:libeventhandler", diff --git a/test/unittest/app_lifecycle_deal_test/BUILD.gn b/test/unittest/app_lifecycle_deal_test/BUILD.gn index ec970a53ee..36856d37e4 100644 --- a/test/unittest/app_lifecycle_deal_test/BUILD.gn +++ b/test/unittest/app_lifecycle_deal_test/BUILD.gn @@ -40,6 +40,7 @@ ohos_unittest("app_lifecycle_deal_test") { ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:perm_verification", @@ -50,7 +51,6 @@ ohos_unittest("app_lifecycle_deal_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/app_mgr_client_first_test/BUILD.gn b/test/unittest/app_mgr_client_first_test/BUILD.gn index 40afe6c0bc..3814a27991 100644 --- a/test/unittest/app_mgr_client_first_test/BUILD.gn +++ b/test/unittest/app_mgr_client_first_test/BUILD.gn @@ -41,6 +41,7 @@ ohos_unittest("app_mgr_client_first_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", ] @@ -50,7 +51,6 @@ ohos_unittest("app_mgr_client_first_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/app_mgr_client_test/BUILD.gn b/test/unittest/app_mgr_client_test/BUILD.gn index ea2e8fb595..6f31cb7f27 100644 --- a/test/unittest/app_mgr_client_test/BUILD.gn +++ b/test/unittest/app_mgr_client_test/BUILD.gn @@ -41,6 +41,7 @@ ohos_unittest("AppMgrClientTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", ] @@ -50,7 +51,6 @@ ohos_unittest("AppMgrClientTest") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/app_mgr_event_test/BUILD.gn b/test/unittest/app_mgr_event_test/BUILD.gn index 1b1292c91a..4935309522 100644 --- a/test/unittest/app_mgr_event_test/BUILD.gn +++ b/test/unittest/app_mgr_event_test/BUILD.gn @@ -26,12 +26,14 @@ ohos_unittest("app_mgr_event_test") { configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] - deps = [ "${ability_runtime_services_path}/appmgr:libappms" ] + deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_services_path}/appmgr:libappms", + ] external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/app_mgr_proxy_test/BUILD.gn b/test/unittest/app_mgr_proxy_test/BUILD.gn index 3e3ae840a5..22614c93bd 100644 --- a/test/unittest/app_mgr_proxy_test/BUILD.gn +++ b/test/unittest/app_mgr_proxy_test/BUILD.gn @@ -28,10 +28,13 @@ ohos_unittest("AppMgrProxyTest") { sources = [ "app_mgr_proxy_test.cpp" ] + deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] + external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "c_utils:utils", "googletest:gmock_main", "googletest:gtest_main", diff --git a/test/unittest/app_mgr_service_dump_test/BUILD.gn b/test/unittest/app_mgr_service_dump_test/BUILD.gn index 818f2d300a..1f768e0846 100644 --- a/test/unittest/app_mgr_service_dump_test/BUILD.gn +++ b/test/unittest/app_mgr_service_dump_test/BUILD.gn @@ -32,6 +32,7 @@ ohos_unittest("app_mgr_service_dump_test") { configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", @@ -39,7 +40,6 @@ ohos_unittest("app_mgr_service_dump_test") { external_deps = [ "ability_base:want", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/app_mgr_service_event_handler_test/BUILD.gn b/test/unittest/app_mgr_service_event_handler_test/BUILD.gn index 2f5e6edb05..27a8fee9fe 100644 --- a/test/unittest/app_mgr_service_event_handler_test/BUILD.gn +++ b/test/unittest/app_mgr_service_event_handler_test/BUILD.gn @@ -66,6 +66,7 @@ ohos_unittest("AMSEventHandlerTest") { } deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/global/common:runtime_utils", "${ability_runtime_path}/utils/global/freeze:freeze_util", @@ -80,7 +81,6 @@ ohos_unittest("AMSEventHandlerTest") { external_deps = [ "ability_base:want", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "appspawn:appspawn_client", "bundle_framework:appexecfwk_base", @@ -99,6 +99,7 @@ ohos_unittest("AMSEventHandlerTest") { "init:libbegetutil", "ipc:ipc_core", "ipc:ipc_single", + "json:nlohmann_json_static", "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", "memmgr:memmgrclient", @@ -107,7 +108,6 @@ ohos_unittest("AMSEventHandlerTest") { "resource_schedule_service:ressched_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", - "json:nlohmann_json_static", "window_manager:session_manager_lite", ] if (os_dlp_part_enabled) { diff --git a/test/unittest/app_mgr_service_fourth_test/BUILD.gn b/test/unittest/app_mgr_service_fourth_test/BUILD.gn index 9add4646ae..1b7f745357 100644 --- a/test/unittest/app_mgr_service_fourth_test/BUILD.gn +++ b/test/unittest/app_mgr_service_fourth_test/BUILD.gn @@ -55,21 +55,21 @@ ohos_unittest("app_mgr_service_fourth_test") { ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_path}/utils/global/common:runtime_utils", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:hisysevent_report", - "${ability_runtime_test_path}/moduletest/common/ams:appmgr_mst_source", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_services_path}/common:user_controller", + "${ability_runtime_test_path}/moduletest/common/ams:appmgr_mst_source", ] external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/app_mgr_service_inner_fifth_test/BUILD.gn b/test/unittest/app_mgr_service_inner_fifth_test/BUILD.gn index 7c3a8fd0be..4c35c24009 100644 --- a/test/unittest/app_mgr_service_inner_fifth_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_fifth_test/BUILD.gn @@ -49,6 +49,7 @@ ohos_unittest("AppMgrServiceInnerFifthTest") { configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:perm_verification", @@ -58,7 +59,6 @@ ohos_unittest("AppMgrServiceInnerFifthTest") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/app_mgr_service_inner_fourth_test/BUILD.gn b/test/unittest/app_mgr_service_inner_fourth_test/BUILD.gn index 131383cc95..b847511910 100644 --- a/test/unittest/app_mgr_service_inner_fourth_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_fourth_test/BUILD.gn @@ -53,6 +53,7 @@ ohos_unittest("AppMgrServiceInnerFourthTest") { ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/appmgr:libappms", @@ -63,7 +64,6 @@ ohos_unittest("AppMgrServiceInnerFourthTest") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/app_mgr_service_inner_tdd_second_test/BUILD.gn b/test/unittest/app_mgr_service_inner_tdd_second_test/BUILD.gn index ec079337b6..be15dc523f 100644 --- a/test/unittest/app_mgr_service_inner_tdd_second_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_tdd_second_test/BUILD.gn @@ -39,6 +39,7 @@ ohos_unittest("app_mgr_service_inner_tdd_second_test") { configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:task_handler_wrap", ] @@ -46,7 +47,6 @@ ohos_unittest("app_mgr_service_inner_tdd_second_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/app_mgr_service_inner_tdd_test/BUILD.gn b/test/unittest/app_mgr_service_inner_tdd_test/BUILD.gn index 04bc61b863..885f3ade14 100644 --- a/test/unittest/app_mgr_service_inner_tdd_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_tdd_test/BUILD.gn @@ -43,6 +43,7 @@ ohos_unittest("app_mgr_service_inner_tdd_test") { configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:task_handler_wrap", @@ -51,7 +52,6 @@ ohos_unittest("app_mgr_service_inner_tdd_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "access_token:libnativetoken", "access_token:libtoken_setproc", "appspawn:appspawn_client", diff --git a/test/unittest/app_mgr_service_inner_tdd_third_test/BUILD.gn b/test/unittest/app_mgr_service_inner_tdd_third_test/BUILD.gn index 97372c0047..b00c3eca88 100644 --- a/test/unittest/app_mgr_service_inner_tdd_third_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_tdd_third_test/BUILD.gn @@ -44,6 +44,7 @@ ohos_unittest("app_mgr_service_inner_tdd_third_test") { ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:task_handler_wrap", ] @@ -51,7 +52,6 @@ ohos_unittest("app_mgr_service_inner_tdd_third_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/app_mgr_service_inner_test/BUILD.gn b/test/unittest/app_mgr_service_inner_test/BUILD.gn index b368ea7cea..0da24989a0 100644 --- a/test/unittest/app_mgr_service_inner_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_test/BUILD.gn @@ -53,6 +53,7 @@ ohos_unittest("AppMgrServiceInnerTest") { configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:perm_verification", @@ -62,7 +63,6 @@ ohos_unittest("AppMgrServiceInnerTest") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/app_mgr_service_second_test/BUILD.gn b/test/unittest/app_mgr_service_second_test/BUILD.gn index 2d029e2d22..b9627f7305 100644 --- a/test/unittest/app_mgr_service_second_test/BUILD.gn +++ b/test/unittest/app_mgr_service_second_test/BUILD.gn @@ -43,6 +43,7 @@ ohos_unittest("app_mgr_service_second_test") { ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -54,7 +55,6 @@ ohos_unittest("app_mgr_service_second_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/app_mgr_service_test/BUILD.gn b/test/unittest/app_mgr_service_test/BUILD.gn index f7d76bc9c9..cc9d87bc4a 100644 --- a/test/unittest/app_mgr_service_test/BUILD.gn +++ b/test/unittest/app_mgr_service_test/BUILD.gn @@ -40,6 +40,7 @@ ohos_unittest("app_mgr_service_test") { configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -51,7 +52,6 @@ ohos_unittest("app_mgr_service_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/app_mgr_service_third_test/BUILD.gn b/test/unittest/app_mgr_service_third_test/BUILD.gn index 028bb8edbf..7e9f1b7e0c 100644 --- a/test/unittest/app_mgr_service_third_test/BUILD.gn +++ b/test/unittest/app_mgr_service_third_test/BUILD.gn @@ -44,6 +44,7 @@ ohos_unittest("app_mgr_service_third_test") { configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -55,7 +56,6 @@ ohos_unittest("app_mgr_service_third_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/app_mgr_stub_test/BUILD.gn b/test/unittest/app_mgr_stub_test/BUILD.gn index 1860e695e9..ec76249ba8 100644 --- a/test/unittest/app_mgr_stub_test/BUILD.gn +++ b/test/unittest/app_mgr_stub_test/BUILD.gn @@ -26,10 +26,13 @@ ohos_unittest("AppMgrStubTest") { sources = [ "app_mgr_stub_test.cpp" ] + deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] + external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "c_utils:utils", "googletest:gmock_main", diff --git a/test/unittest/app_recovery_test/BUILD.gn b/test/unittest/app_recovery_test/BUILD.gn index 06540710a3..d9d00e5ec1 100644 --- a/test/unittest/app_recovery_test/BUILD.gn +++ b/test/unittest/app_recovery_test/BUILD.gn @@ -37,9 +37,15 @@ ohos_unittest("AppRecoveryUnitTest") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/dataobs_manager:dataobs_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", + "${ability_runtime_innerkits_path}/napi_base_context:napi_base_context", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:app_context_utils", "${ability_runtime_native_path}/appkit:appkit_delegator", @@ -52,12 +58,6 @@ ohos_unittest("AppRecoveryUnitTest") { "ability_base:configuration", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_context_native", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", - "ability_runtime:napi_base_context", - "ability_runtime:runtime", - "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "access_token:libtoken_callback_sdk", "bundle_framework:appexecfwk_base", @@ -67,9 +67,9 @@ ohos_unittest("AppRecoveryUnitTest") { "eventhandler:libeventhandler", "faultloggerd:libdfx_dumpcatcher", "form_fwk:fmskit_native", + "form_fwk:form_common_info", "form_fwk:form_manager", "form_fwk:form_render_info", - "form_fwk:form_common_info", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", @@ -104,9 +104,15 @@ ohos_unittest("AbilityRecoveryUnitTest") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/dataobs_manager:dataobs_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", + "${ability_runtime_innerkits_path}/napi_base_context:napi_base_context", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:app_context_utils", "${ability_runtime_native_path}/appkit:appkit_delegator", @@ -118,12 +124,6 @@ ohos_unittest("AbilityRecoveryUnitTest") { "ability_base:configuration", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_context_native", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", - "ability_runtime:napi_base_context", - "ability_runtime:runtime", - "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "access_token:libtoken_callback_sdk", "bundle_framework:appexecfwk_base", @@ -133,9 +133,9 @@ ohos_unittest("AbilityRecoveryUnitTest") { "eventhandler:libeventhandler", "faultloggerd:libdfx_dumpcatcher", "form_fwk:fmskit_native", + "form_fwk:form_common_info", "form_fwk:form_manager", "form_fwk:form_render_info", - "form_fwk:form_common_info", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", diff --git a/test/unittest/app_scheduler_host_test/BUILD.gn b/test/unittest/app_scheduler_host_test/BUILD.gn index 41437905c0..d73977a1e2 100644 --- a/test/unittest/app_scheduler_host_test/BUILD.gn +++ b/test/unittest/app_scheduler_host_test/BUILD.gn @@ -34,6 +34,7 @@ ohos_unittest("app_scheduler_host_test") { sources = [ "app_scheduler_host_test.cpp" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", ] @@ -43,7 +44,6 @@ ohos_unittest("app_scheduler_host_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/app_scheduler_proxy_test/BUILD.gn b/test/unittest/app_scheduler_proxy_test/BUILD.gn index 158d13e88f..42b57721bb 100644 --- a/test/unittest/app_scheduler_proxy_test/BUILD.gn +++ b/test/unittest/app_scheduler_proxy_test/BUILD.gn @@ -34,6 +34,7 @@ ohos_unittest("app_scheduler_proxy_test") { sources = [ "app_scheduler_proxy_test.cpp" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", ] @@ -43,7 +44,6 @@ ohos_unittest("app_scheduler_proxy_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/app_service_extension_context_test/BUILD.gn b/test/unittest/app_service_extension_context_test/BUILD.gn index e814ab634c..1969cd8e46 100644 --- a/test/unittest/app_service_extension_context_test/BUILD.gn +++ b/test/unittest/app_service_extension_context_test/BUILD.gn @@ -40,11 +40,14 @@ ohos_unittest("app_service_extension_context_test") { } 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_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}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -57,9 +60,6 @@ ohos_unittest("app_service_extension_context_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_context_native", - "ability_runtime:ability_manager", - "ability_runtime:runtime", "c_utils:utils", "common_event_service:cesfwk_innerkits", "ffrt:libffrt", diff --git a/test/unittest/app_service_extension_test/BUILD.gn b/test/unittest/app_service_extension_test/BUILD.gn index 4f1817655e..e5b0b52680 100644 --- a/test/unittest/app_service_extension_test/BUILD.gn +++ b/test/unittest/app_service_extension_test/BUILD.gn @@ -44,42 +44,42 @@ ohos_unittest("app_service_extension_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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:abilitykit_utils", "${ability_runtime_native_path}/ability/native:app_service_extension", "${ability_runtime_native_path}/ability/native:configuration_helper", "${ability_runtime_native_path}/appkit:app_context", - "${ability_runtime_native_path}/appkit:application_image_observer_manager", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/appkit:application_image_observer_manager", ] external_deps = [ "ability_base:base", "ability_base:configuration", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:abilitykit_native", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", - "form_fwk:fmskit_native", "ffrt:libffrt", + "form_fwk:fmskit_native", "googletest:gmock_main", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", "ipc:ipc_napi", "napi:ace_napi", - "samgr:samgr_proxy", "runtime_core:ani", + "samgr:samgr_proxy", ] if (ability_runtime_graphics) { diff --git a/test/unittest/app_spawn_client_second_test/BUILD.gn b/test/unittest/app_spawn_client_second_test/BUILD.gn index 20672a8743..f483220bad 100644 --- a/test/unittest/app_spawn_client_second_test/BUILD.gn +++ b/test/unittest/app_spawn_client_second_test/BUILD.gn @@ -31,12 +31,14 @@ ohos_unittest("AppSpawnClientSecondTest") { configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] - deps = [ "${ability_runtime_services_path}/appmgr:libappms" ] + deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_services_path}/appmgr:libappms", + ] external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "access_token:libnativetoken", "access_token:libtoken_setproc", "appspawn:appspawn_client", diff --git a/test/unittest/app_spawn_client_test/BUILD.gn b/test/unittest/app_spawn_client_test/BUILD.gn index abbcccd784..1b35960bef 100644 --- a/test/unittest/app_spawn_client_test/BUILD.gn +++ b/test/unittest/app_spawn_client_test/BUILD.gn @@ -29,6 +29,7 @@ ohos_unittest("AppSpawnClientTest") { configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:perm_verification", @@ -37,7 +38,6 @@ ohos_unittest("AppSpawnClientTest") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "access_token:libnativetoken", "access_token:libtoken_setproc", "appspawn:appspawn_client", @@ -46,7 +46,6 @@ ohos_unittest("AppSpawnClientTest") { "c_utils:utils", "eventhandler:libeventhandler", "googletest:gtest_main", - "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "init:libbeget_proxy", diff --git a/test/unittest/app_start/js_startup_config_test/BUILD.gn b/test/unittest/app_start/js_startup_config_test/BUILD.gn index da57f49cdc..e99878ae1c 100644 --- a/test/unittest/app_start/js_startup_config_test/BUILD.gn +++ b/test/unittest/app_start/js_startup_config_test/BUILD.gn @@ -66,9 +66,6 @@ ohos_unittest("js_startup_config_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", - "ability_runtime:js_environment", "bundle_framework:libappexecfwk_common", "c_utils:utils", "ffrt:libffrt", diff --git a/test/unittest/app_state_observer_manager_test/BUILD.gn b/test/unittest/app_state_observer_manager_test/BUILD.gn index 5189a1cfdc..39a46fd7b5 100755 --- a/test/unittest/app_state_observer_manager_test/BUILD.gn +++ b/test/unittest/app_state_observer_manager_test/BUILD.gn @@ -40,6 +40,7 @@ ohos_unittest("app_state_observer_manager_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_services_path}/appmgr:libappms", @@ -50,7 +51,6 @@ ohos_unittest("app_state_observer_manager_test") { ] external_deps = [ - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "appspawn:appspawn_client", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/app_state_observer_manager_test_second/BUILD.gn b/test/unittest/app_state_observer_manager_test_second/BUILD.gn index 71c9fbd3f9..69215affb9 100755 --- a/test/unittest/app_state_observer_manager_test_second/BUILD.gn +++ b/test/unittest/app_state_observer_manager_test_second/BUILD.gn @@ -40,6 +40,7 @@ ohos_unittest("app_state_observer_manager_test_second") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_services_path}/appmgr:libappms", @@ -50,7 +51,6 @@ ohos_unittest("app_state_observer_manager_test_second") { ] external_deps = [ - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "appspawn:appspawn_client", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/app_utils_test/BUILD.gn b/test/unittest/app_utils_test/BUILD.gn index 9664d60af1..f4f5ae22e0 100644 --- a/test/unittest/app_utils_test/BUILD.gn +++ b/test/unittest/app_utils_test/BUILD.gn @@ -27,10 +27,12 @@ ohos_unittest("app_utils_test") { sources = [ "app_utils_test.cpp" ] - deps = [ "${ability_runtime_services_path}/common:app_util" ] + deps = [ + "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_services_path}/common:app_util", + ] external_deps = [ - "ability_runtime:abilitykit_native", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/appkit/ohos_application_first_test/BUILD.gn b/test/unittest/appkit/ohos_application_first_test/BUILD.gn index 3ba9a882ea..e8ee018f33 100644 --- a/test/unittest/appkit/ohos_application_first_test/BUILD.gn +++ b/test/unittest/appkit/ohos_application_first_test/BUILD.gn @@ -57,7 +57,12 @@ ohos_unittest("ohos_application_first_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${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_thread", + "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", "${ability_runtime_native_path}/appkit:app_context", @@ -69,11 +74,6 @@ ohos_unittest("ohos_application_first_test") { "ability_base:configuration", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", - "ability_runtime:abilitykit_native", - "ability_runtime:app_manager", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/appkit/ohos_application_test/BUILD.gn b/test/unittest/appkit/ohos_application_test/BUILD.gn index ee78b25419..793141673d 100644 --- a/test/unittest/appkit/ohos_application_test/BUILD.gn +++ b/test/unittest/appkit/ohos_application_test/BUILD.gn @@ -49,7 +49,12 @@ ohos_unittest("ohos_application_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${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_thread", + "${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:uiabilitykit_native", @@ -62,11 +67,6 @@ ohos_unittest("ohos_application_test") { "ability_base:configuration", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", - "ability_runtime:abilitykit_native", - "ability_runtime:app_manager", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/application_cleaner_second_test/BUILD.gn b/test/unittest/application_cleaner_second_test/BUILD.gn index 7f7130bcfd..cebe02aad6 100644 --- a/test/unittest/application_cleaner_second_test/BUILD.gn +++ b/test/unittest/application_cleaner_second_test/BUILD.gn @@ -41,6 +41,7 @@ ohos_unittest("application_cleaner_second_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:configuration_helper", @@ -55,7 +56,6 @@ ohos_unittest("application_cleaner_second_test") { "ability_base:configuration", "ability_base:extractortool", "ability_base:want", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/application_context_second_test/BUILD.gn b/test/unittest/application_context_second_test/BUILD.gn index dd7e48d616..67f8b4f3a9 100644 --- a/test/unittest/application_context_second_test/BUILD.gn +++ b/test/unittest/application_context_second_test/BUILD.gn @@ -39,15 +39,15 @@ ohos_unittest("application_context_second_test") { deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:service_extension", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", ] external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:ability_context_native", - "ability_runtime:abilitykit_native", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/application_context_test/BUILD.gn b/test/unittest/application_context_test/BUILD.gn index fe6960ca25..158c748d5c 100644 --- a/test/unittest/application_context_test/BUILD.gn +++ b/test/unittest/application_context_test/BUILD.gn @@ -43,15 +43,15 @@ ohos_unittest("application_context_test") { deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:service_extension", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", ] external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:ability_context_native", - "ability_runtime:abilitykit_native", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/application_state_filter_test/BUILD.gn b/test/unittest/application_state_filter_test/BUILD.gn index 7823ee0c36..4b5564a0fc 100644 --- a/test/unittest/application_state_filter_test/BUILD.gn +++ b/test/unittest/application_state_filter_test/BUILD.gn @@ -26,10 +26,13 @@ ohos_unittest("ApplicationStateFilterTest") { sources = [ "application_state_filter_test.cpp" ] + deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] + external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "c_utils:utils", "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 f6b2f9e467..53f66cf1a2 100644 --- a/test/unittest/assert_fault_callback_death_mgr_test/BUILD.gn +++ b/test/unittest/assert_fault_callback_death_mgr_test/BUILD.gn @@ -68,7 +68,6 @@ ohos_unittest("assert_fault_callback_death_mgr_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/authorization_result_test/BUILD.gn b/test/unittest/authorization_result_test/BUILD.gn index 3bd794690b..f5bb1eac65 100644 --- a/test/unittest/authorization_result_test/BUILD.gn +++ b/test/unittest/authorization_result_test/BUILD.gn @@ -25,10 +25,12 @@ ohos_unittest("authorization_result_test") { configs = [ "${ability_runtime_test_path}/mock/services_abilitymgr_test:aafwk_mock_config" ] cflags = [] - deps = [ "${ability_runtime_native_path}/ability/native:abilitykit_native" ] + deps = [ + "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability:ability_context_native", + ] external_deps = [ - "ability_runtime:ability_context_native", "access_token:libtoken_callback_sdk", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/unittest/auto_fill_manager_test/BUILD.gn b/test/unittest/auto_fill_manager_test/BUILD.gn index 52cb8c545b..0a590a8ce0 100644 --- a/test/unittest/auto_fill_manager_test/BUILD.gn +++ b/test/unittest/auto_fill_manager_test/BUILD.gn @@ -34,8 +34,12 @@ ohos_unittest("auto_fill_manager_test") { ] 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_business_error", + "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability:ability_context_native", ] configs = [ "${ability_runtime_services_path}/common:common_config" ] @@ -45,11 +49,6 @@ ohos_unittest("auto_fill_manager_test") { "ability_base:configuration", "ability_base:view_data", "ability_base:want", - "ability_runtime:ability_context_native", - "ability_runtime:ability_manager", - "ability_runtime:abilitykit_native", - "ability_runtime:app_manager", - "ability_runtime:runtime", "accessibility:accessibility_common", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/unittest/auto_fill_request_callback_interface_test/BUILD.gn b/test/unittest/auto_fill_request_callback_interface_test/BUILD.gn index 6543fc08b0..e033d101cf 100644 --- a/test/unittest/auto_fill_request_callback_interface_test/BUILD.gn +++ b/test/unittest/auto_fill_request_callback_interface_test/BUILD.gn @@ -28,8 +28,12 @@ ohos_unittest("auto_fill_request_callback_interface_test") { sources = [ "auto_fill_request_callback_interface_test.cpp" ] 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_business_error", + "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability:ability_context_native", ] configs = [ "${ability_runtime_services_path}/common:common_config" ] @@ -39,11 +43,6 @@ ohos_unittest("auto_fill_request_callback_interface_test") { "ability_base:configuration", "ability_base:view_data", "ability_base:want", - "ability_runtime:ability_context_native", - "ability_runtime:ability_manager", - "ability_runtime:abilitykit_native", - "ability_runtime:app_manager", - "ability_runtime:runtime", "accessibility:accessibility_common", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/unittest/auto_startup_info_test/BUILD.gn b/test/unittest/auto_startup_info_test/BUILD.gn index a08399d623..b2c1ac0803 100644 --- a/test/unittest/auto_startup_info_test/BUILD.gn +++ b/test/unittest/auto_startup_info_test/BUILD.gn @@ -35,8 +35,8 @@ ohos_unittest("auto_startup_info_test") { "${ability_runtime_abilitymgr_path}/:abilityms", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", - "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/ability/native:auto_startup_callback", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", ] @@ -44,7 +44,6 @@ ohos_unittest("auto_startup_info_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/cache_process_manager_test/BUILD.gn b/test/unittest/cache_process_manager_test/BUILD.gn index b510eb9d00..27a5b7ba86 100644 --- a/test/unittest/cache_process_manager_test/BUILD.gn +++ b/test/unittest/cache_process_manager_test/BUILD.gn @@ -41,6 +41,7 @@ ohos_unittest("cache_process_manager_test") { configs = [ "${ability_runtime_services_path}/appmgr:appmgr_config" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_path}/utils/global/common:runtime_utils", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -53,7 +54,6 @@ ohos_unittest("cache_process_manager_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/child_process_manager_second_test/BUILD.gn b/test/unittest/child_process_manager_second_test/BUILD.gn index 4d4b2399a1..a969b15955 100644 --- a/test/unittest/child_process_manager_second_test/BUILD.gn +++ b/test/unittest/child_process_manager_second_test/BUILD.gn @@ -43,18 +43,16 @@ ohos_unittest("child_process_manager_second_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_path}/interfaces/inner_api/child_process_manager:child_process_manager", "${ability_runtime_services_path}/common:app_util", ] external_deps = [ - "ability_runtime:abilitykit_native", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", "googletest:gmock_main", - "googletest:gmock_main", - "googletest:gtest_main", "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_capi", diff --git a/test/unittest/child_process_manager_test/BUILD.gn b/test/unittest/child_process_manager_test/BUILD.gn index 9e72ee1b7b..ffeda5f8e6 100644 --- a/test/unittest/child_process_manager_test/BUILD.gn +++ b/test/unittest/child_process_manager_test/BUILD.gn @@ -44,12 +44,12 @@ 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_path}/interfaces/inner_api/child_process_manager:child_process_manager", "${ability_runtime_services_path}/common:app_util_static", ] external_deps = [ - "ability_runtime:abilitykit_native", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", 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 860ca47e02..dda4897dab 100644 --- a/test/unittest/cj_ability_connect_callback_object_test/BUILD.gn +++ b/test/unittest/cj_ability_connect_callback_object_test/BUILD.gn @@ -40,13 +40,13 @@ ohos_unittest("cj_ability_connect_callback_object_test") { } 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", ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/cj_ability_delegator_args_test/BUILD.gn b/test/unittest/cj_ability_delegator_args_test/BUILD.gn index a1eb3f5594..059b98f05b 100644 --- a/test/unittest/cj_ability_delegator_args_test/BUILD.gn +++ b/test/unittest/cj_ability_delegator_args_test/BUILD.gn @@ -46,10 +46,12 @@ ohos_unittest("cj_ability_delegator_args_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", - "${ability_runtime_native_path}/ability:ability_context_native", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_delegator", "${ability_runtime_native_path}/appkit:appkit_manager_helper", @@ -63,9 +65,6 @@ ohos_unittest("cj_ability_delegator_args_test") { "ability_base:configuration", "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_context_native", - "ability_runtime:runtime", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/cj_ability_delegator_test/BUILD.gn b/test/unittest/cj_ability_delegator_test/BUILD.gn index 118a54889b..2af5e3a1fb 100644 --- a/test/unittest/cj_ability_delegator_test/BUILD.gn +++ b/test/unittest/cj_ability_delegator_test/BUILD.gn @@ -45,10 +45,12 @@ ohos_unittest("cj_ability_delegator_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", - "${ability_runtime_native_path}/ability:ability_context_native", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_delegator", "${ability_runtime_native_path}/appkit:appkit_manager_helper", @@ -62,9 +64,6 @@ ohos_unittest("cj_ability_delegator_test") { "ability_base:configuration", "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_context_native", - "ability_runtime:runtime", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/cj_ability_ffi_mock_test/BUILD.gn b/test/unittest/cj_ability_ffi_mock_test/BUILD.gn index 33015bc155..3eab6b76de 100644 --- a/test/unittest/cj_ability_ffi_mock_test/BUILD.gn +++ b/test/unittest/cj_ability_ffi_mock_test/BUILD.gn @@ -39,10 +39,12 @@ ohos_unittest("cj_ability_ffi_mock_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", - "${ability_runtime_native_path}/ability:ability_context_native", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", @@ -54,13 +56,9 @@ ohos_unittest("cj_ability_ffi_mock_test") { "ability_base:configuration", "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_context_native", - "ability_runtime:runtime", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", - "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ffrt:libffrt", diff --git a/test/unittest/cj_ability_lifecycle_callback_Impl_test/BUILD.gn b/test/unittest/cj_ability_lifecycle_callback_Impl_test/BUILD.gn index 8eee71bf3e..d7752ad607 100644 --- a/test/unittest/cj_ability_lifecycle_callback_Impl_test/BUILD.gn +++ b/test/unittest/cj_ability_lifecycle_callback_Impl_test/BUILD.gn @@ -47,7 +47,6 @@ ohos_unittest("cj_ability_lifecycle_callback_Impl_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/cj_ability_stage_object_test/BUILD.gn b/test/unittest/cj_ability_stage_object_test/BUILD.gn index f45319d584..5992eda3d3 100644 --- a/test/unittest/cj_ability_stage_object_test/BUILD.gn +++ b/test/unittest/cj_ability_stage_object_test/BUILD.gn @@ -58,9 +58,9 @@ ohos_unittest("cj_ability_stage_object_test") { "${ability_runtime_native_path}/ability/native:configuration_helper", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", "${ability_runtime_native_path}/appkit:app_context", - "${ability_runtime_native_path}/appkit:application_image_observer_manager", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/appkit:application_image_observer_manager", "${ability_runtime_path}/frameworks/cj/ffi:cj_ability_ffi", ] @@ -68,10 +68,7 @@ ohos_unittest("cj_ability_stage_object_test") { "ability_base:base", "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", "bundle_framework:appexecfwk_core", "bundle_framework:cj_bundle_manager_ffi", "c_utils:utils", @@ -81,8 +78,8 @@ ohos_unittest("cj_ability_stage_object_test") { "form_fwk:fmskit_native", "googletest:gmock_main", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", @@ -90,8 +87,8 @@ ohos_unittest("cj_ability_stage_object_test") { "napi:cj_bind_ffi", "napi:cj_bind_native", "resource_management:global_resmgr", - "samgr:samgr_proxy", "runtime_core:ani", + "samgr:samgr_proxy", ] if (ability_runtime_graphics) { diff --git a/test/unittest/cj_ability_stage_test/BUILD.gn b/test/unittest/cj_ability_stage_test/BUILD.gn index 7f4ba6a859..8b88b15a16 100644 --- a/test/unittest/cj_ability_stage_test/BUILD.gn +++ b/test/unittest/cj_ability_stage_test/BUILD.gn @@ -61,10 +61,10 @@ ohos_unittest("cj_ability_stage_test") { "${ability_runtime_native_path}/ability/native:configuration_helper", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", "${ability_runtime_native_path}/appkit:app_context", - "${ability_runtime_native_path}/appkit:application_image_observer_manager", "${ability_runtime_native_path}/appkit:appkit_delegator", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/appkit:application_image_observer_manager", "${ability_runtime_path}/cj_environment/frameworks/cj_environment:cj_environment", "${ability_runtime_path}/frameworks/cj/ffi:cj_ability_ffi", ] @@ -73,10 +73,7 @@ ohos_unittest("cj_ability_stage_test") { "ability_base:base", "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", "bundle_framework:appexecfwk_core", "bundle_framework:cj_bundle_manager_ffi", "c_utils:utils", @@ -86,8 +83,8 @@ ohos_unittest("cj_ability_stage_test") { "form_fwk:fmskit_native", "googletest:gmock_main", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", @@ -95,8 +92,8 @@ ohos_unittest("cj_ability_stage_test") { "napi:cj_bind_ffi", "napi:cj_bind_native", "resource_management:global_resmgr", - "samgr:samgr_proxy", "runtime_core:ani", + "samgr:samgr_proxy", ] if (ability_runtime_graphics) { diff --git a/test/unittest/cj_application_context_test/BUILD.gn b/test/unittest/cj_application_context_test/BUILD.gn index 5563d277b2..fed9c7b2cc 100644 --- a/test/unittest/cj_application_context_test/BUILD.gn +++ b/test/unittest/cj_application_context_test/BUILD.gn @@ -47,11 +47,13 @@ ohos_unittest("cj_application_context_test") { "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", - "${ability_runtime_native_path}/ability:ability_context_native", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:app_context_utils", "${ability_runtime_native_path}/appkit:appkit_manager_helper", @@ -65,9 +67,6 @@ ohos_unittest("cj_application_context_test") { "ability_base:configuration", "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_context_native", - "ability_runtime:runtime", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/cj_element_name_ffi_test/BUILD.gn b/test/unittest/cj_element_name_ffi_test/BUILD.gn index 4ab9bbe706..b2ca76c4e7 100644 --- a/test/unittest/cj_element_name_ffi_test/BUILD.gn +++ b/test/unittest/cj_element_name_ffi_test/BUILD.gn @@ -41,10 +41,12 @@ ohos_unittest("cj_element_name_ffi_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", - "${ability_runtime_native_path}/ability:ability_context_native", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", @@ -57,9 +59,6 @@ ohos_unittest("cj_element_name_ffi_test") { "ability_base:configuration", "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_context_native", - "ability_runtime:runtime", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/cj_environment_test/BUILD.gn b/test/unittest/cj_environment_test/BUILD.gn index 9a075c816a..3fade75bb1 100644 --- a/test/unittest/cj_environment_test/BUILD.gn +++ b/test/unittest/cj_environment_test/BUILD.gn @@ -58,11 +58,8 @@ ohos_unittest("cj_environment_other_test") { "ability_base:base", "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "bounds_checking_function:libsec_shared", "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/cj_test_runner_test/BUILD.gn b/test/unittest/cj_test_runner_test/BUILD.gn index f5dba3c41b..d8ea28d397 100644 --- a/test/unittest/cj_test_runner_test/BUILD.gn +++ b/test/unittest/cj_test_runner_test/BUILD.gn @@ -79,10 +79,7 @@ ohos_unittest("cj_test_runner_test") { "ability_base:configuration", "ability_base:extractortool", "ability_base:want", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/cj_ui_ability_test/BUILD.gn b/test/unittest/cj_ui_ability_test/BUILD.gn index 55bab6eadb..d782578669 100644 --- a/test/unittest/cj_ui_ability_test/BUILD.gn +++ b/test/unittest/cj_ui_ability_test/BUILD.gn @@ -53,18 +53,19 @@ ohos_unittest("cj_ui_ability_test") { "${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_innerkits_path}/wantagent:wantagent_innerkits", "${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:insight_intent_executor", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", - "${ability_runtime_native_path}/appkit:application_image_observer_manager", "${ability_runtime_native_path}/appkit:appkit_delegator", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/appkit:application_image_observer_manager", "${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", @@ -77,9 +78,6 @@ ohos_unittest("cj_ui_ability_test") { "ability_base:configuration", "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_context_native", - "ability_runtime:runtime", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -89,8 +87,8 @@ ohos_unittest("cj_ui_ability_test") { "form_fwk:fmskit_native", "googletest:gmock_main", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "init:libbegetutil", @@ -99,10 +97,10 @@ ohos_unittest("cj_ui_ability_test") { "napi:cj_bind_ffi", "napi:cj_bind_native", "resource_management:global_resmgr", + "runtime_core:ani", "samgr:samgr_proxy", "window_manager:cj_window_ffi", "window_manager:scene_session", - "runtime_core:ani", ] if (ability_runtime_graphics) { diff --git a/test/unittest/cj_utils_ffi_test/BUILD.gn b/test/unittest/cj_utils_ffi_test/BUILD.gn index 7d6373e63e..76e01800db 100644 --- a/test/unittest/cj_utils_ffi_test/BUILD.gn +++ b/test/unittest/cj_utils_ffi_test/BUILD.gn @@ -41,10 +41,12 @@ ohos_unittest("cj_utils_ffi_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", - "${ability_runtime_native_path}/ability:ability_context_native", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", @@ -57,9 +59,6 @@ ohos_unittest("cj_utils_ffi_test") { "ability_base:configuration", "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_context_native", - "ability_runtime:runtime", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/cj_want_ffi_test/BUILD.gn b/test/unittest/cj_want_ffi_test/BUILD.gn index 17de323edd..a87da594ac 100644 --- a/test/unittest/cj_want_ffi_test/BUILD.gn +++ b/test/unittest/cj_want_ffi_test/BUILD.gn @@ -33,10 +33,12 @@ ohos_unittest("cj_want_ffi_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", - "${ability_runtime_native_path}/ability:ability_context_native", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", @@ -49,9 +51,6 @@ ohos_unittest("cj_want_ffi_test") { "ability_base:configuration", "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_context_native", - "ability_runtime:runtime", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/completed_dispatcher_test/BUILD.gn b/test/unittest/completed_dispatcher_test/BUILD.gn index 8141535f4a..15ba384194 100644 --- a/test/unittest/completed_dispatcher_test/BUILD.gn +++ b/test/unittest/completed_dispatcher_test/BUILD.gn @@ -28,6 +28,9 @@ ohos_unittest("completed_dispatcher_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", + "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", ] @@ -36,9 +39,6 @@ ohos_unittest("completed_dispatcher_test") { "ability_base:base", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", - "ability_runtime:abilitykit_native", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/connect_server_manager_test/BUILD.gn b/test/unittest/connect_server_manager_test/BUILD.gn index 9fa0c8fcdc..9c85edeb82 100644 --- a/test/unittest/connect_server_manager_test/BUILD.gn +++ b/test/unittest/connect_server_manager_test/BUILD.gn @@ -40,12 +40,15 @@ ohos_unittest("connect_server_manager_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/connect_server_manager:connect_server_manager", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_native_path}/ability/native:abilitykit_native", + ] + external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:abilitykit_native", - "ability_runtime:connect_server_manager", - "ability_runtime:runtime", "c_utils:utils", "googletest:gmock_main", "hilog:libhilog", diff --git a/test/unittest/connection_observer_controller_test/BUILD.gn b/test/unittest/connection_observer_controller_test/BUILD.gn index 1081cdee70..524ea60fcd 100755 --- a/test/unittest/connection_observer_controller_test/BUILD.gn +++ b/test/unittest/connection_observer_controller_test/BUILD.gn @@ -35,6 +35,7 @@ ohos_unittest("connection_observer_controller_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -48,7 +49,6 @@ ohos_unittest("connection_observer_controller_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "c_utils:utils", "common_event_service:cesfwk_innerkits", "ffrt:libffrt", diff --git a/test/unittest/connection_observer_test/BUILD.gn b/test/unittest/connection_observer_test/BUILD.gn index e7bfb8260e..a4e5e40580 100644 --- a/test/unittest/connection_observer_test/BUILD.gn +++ b/test/unittest/connection_observer_test/BUILD.gn @@ -37,8 +37,11 @@ ohos_unittest("connection_observer_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } + deps = [ + "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", + ] + external_deps = [ - "ability_runtime:connection_obs_manager", "access_token:libnativetoken", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", diff --git a/test/unittest/connection_record_test/BUILD.gn b/test/unittest/connection_record_test/BUILD.gn index 473480c222..0b732f4b19 100644 --- a/test/unittest/connection_record_test/BUILD.gn +++ b/test/unittest/connection_record_test/BUILD.gn @@ -41,6 +41,7 @@ ohos_unittest("connection_record_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_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", @@ -53,7 +54,6 @@ ohos_unittest("connection_record_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/connection_state_manager_test/BUILD.gn b/test/unittest/connection_state_manager_test/BUILD.gn index 541c64c60c..100a0c290b 100755 --- a/test/unittest/connection_state_manager_test/BUILD.gn +++ b/test/unittest/connection_state_manager_test/BUILD.gn @@ -41,6 +41,7 @@ ohos_unittest("connection_state_manager_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -54,7 +55,6 @@ ohos_unittest("connection_state_manager_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "c_utils:utils", "common_event_service:cesfwk_innerkits", "ffrt:libffrt", 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 e420e802b9..7c0edc7d54 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 @@ -50,12 +50,12 @@ ohos_unittest("continuation_connector_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", ] external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", diff --git a/test/unittest/continuation_test/remote_register_service_test/continuation_device_callback_proxy_test/BUILD.gn b/test/unittest/continuation_test/remote_register_service_test/continuation_device_callback_proxy_test/BUILD.gn index 1773c86fdf..95cf33a9eb 100644 --- a/test/unittest/continuation_test/remote_register_service_test/continuation_device_callback_proxy_test/BUILD.gn +++ b/test/unittest/continuation_test/remote_register_service_test/continuation_device_callback_proxy_test/BUILD.gn @@ -45,11 +45,13 @@ ohos_unittest("continuation_device_callback_proxy_test") { if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "${ability_runtime_native_path}/ability/native:continuation_ipc" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_native_path}/ability/native:continuation_ipc", + ] external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", "c_utils:utils", "googletest:gmock_main", "googletest:gtest_main", 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 7cfc3c7283..f7c1fd9b7a 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 @@ -87,7 +87,6 @@ ohos_unittest("continuation_register_manager_proxy_test") { external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", 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 3a75550220..7e12eca467 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 @@ -87,7 +87,6 @@ ohos_unittest("continuation_register_manager_test") { external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", diff --git a/test/unittest/crowd_test_interceptor_test/BUILD.gn b/test/unittest/crowd_test_interceptor_test/BUILD.gn index 7005c1cd50..75e44e15d0 100644 --- a/test/unittest/crowd_test_interceptor_test/BUILD.gn +++ b/test/unittest/crowd_test_interceptor_test/BUILD.gn @@ -40,6 +40,7 @@ ohos_unittest("crowd_test_interceptor_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -51,7 +52,6 @@ ohos_unittest("crowd_test_interceptor_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", diff --git a/test/unittest/dataobs_mgr_service_dump_test/BUILD.gn b/test/unittest/dataobs_mgr_service_dump_test/BUILD.gn index 118b9f1055..5f2343750e 100644 --- a/test/unittest/dataobs_mgr_service_dump_test/BUILD.gn +++ b/test/unittest/dataobs_mgr_service_dump_test/BUILD.gn @@ -36,6 +36,7 @@ ohos_unittest("dataobs_mgr_service_dump_test") { ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/dataobs_manager:dataobs_manager", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:task_handler_wrap", @@ -44,15 +45,14 @@ ohos_unittest("dataobs_mgr_service_dump_test") { external_deps = [ "ability_base:want", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", "appspawn:appspawn_client", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", - "common_event_service:cesfwk_innerkits", "c_utils:utils", + "common_event_service:cesfwk_innerkits", "data_share:datashare_permission", "ffrt:libffrt", "googletest:gtest_main", diff --git a/test/unittest/dfr_test/appfreeze_event_report_test/BUILD.gn b/test/unittest/dfr_test/appfreeze_event_report_test/BUILD.gn index 3d9fd84f8a..9f90e1701c 100644 --- a/test/unittest/dfr_test/appfreeze_event_report_test/BUILD.gn +++ b/test/unittest/dfr_test/appfreeze_event_report_test/BUILD.gn @@ -30,14 +30,14 @@ ohos_unittest("appfreeze_event_report_test") { sources = [ "appfreeze_event_report_test.cpp" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/common:hisysevent_report", ] external_deps = [ - "ability_runtime:app_manager", - "hisysevent:libhisysevent", "googletest:gmock_main", "googletest:gtest_main", + "hisysevent:libhisysevent", ] } diff --git a/test/unittest/dfr_test/appfreeze_manager_test/BUILD.gn b/test/unittest/dfr_test/appfreeze_manager_test/BUILD.gn index 9ccc2e83c1..cd541a3d67 100644 --- a/test/unittest/dfr_test/appfreeze_manager_test/BUILD.gn +++ b/test/unittest/dfr_test/appfreeze_manager_test/BUILD.gn @@ -61,6 +61,7 @@ ohos_unittest("appfreeze_manager_test") { sources = [ "appfreeze_manager_test.cpp" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", @@ -71,7 +72,6 @@ ohos_unittest("appfreeze_manager_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/dfr_test/cpu_sys_config_test/BUILD.gn b/test/unittest/dfr_test/cpu_sys_config_test/BUILD.gn index 17d43b81a6..146ab90516 100644 --- a/test/unittest/dfr_test/cpu_sys_config_test/BUILD.gn +++ b/test/unittest/dfr_test/cpu_sys_config_test/BUILD.gn @@ -28,10 +28,11 @@ ohos_unittest("cpu_sys_config_test") { sources = [ "cpu_sys_config_test.cpp" ] - deps = [] + deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ - "ability_runtime:app_manager", "googletest:gmock_main", "googletest:gtest_main", ] diff --git a/test/unittest/dlp_state_item_test/BUILD.gn b/test/unittest/dlp_state_item_test/BUILD.gn index 2e7ec4196a..d1817b23dd 100644 --- a/test/unittest/dlp_state_item_test/BUILD.gn +++ b/test/unittest/dlp_state_item_test/BUILD.gn @@ -36,6 +36,7 @@ ohos_unittest("dlp_state_item_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/connectionobs_manager:connection_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -49,7 +50,6 @@ ohos_unittest("dlp_state_item_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/dlp_utils_test/BUILD.gn b/test/unittest/dlp_utils_test/BUILD.gn index 8a399533b1..3aa7371368 100644 --- a/test/unittest/dlp_utils_test/BUILD.gn +++ b/test/unittest/dlp_utils_test/BUILD.gn @@ -25,6 +25,7 @@ ohos_unittest("dlp_utils_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", ] @@ -32,7 +33,6 @@ ohos_unittest("dlp_utils_test") { external_deps = [ "ability_base:session_info", "ability_base:want", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/dummy_values_bucket_test/BUILD.gn b/test/unittest/dummy_values_bucket_test/BUILD.gn index d28a42069f..ad0c73a302 100644 --- a/test/unittest/dummy_values_bucket_test/BUILD.gn +++ b/test/unittest/dummy_values_bucket_test/BUILD.gn @@ -43,10 +43,13 @@ ohos_unittest("dummy_values_bucket_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_native_path}/ability/native:abilitykit_native", + ] + external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:abilitykit_native", "c_utils:utils", "googletest:gmock_main", "hilog:libhilog", diff --git a/test/unittest/dump_utils_test/BUILD.gn b/test/unittest/dump_utils_test/BUILD.gn index 09879cc47c..9a7ff313f4 100644 --- a/test/unittest/dump_utils_test/BUILD.gn +++ b/test/unittest/dump_utils_test/BUILD.gn @@ -45,11 +45,11 @@ ohos_unittest("dump_utils_test") { deps = [ "${ability_runtime_abilitymgr_path}/:abilityms", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", ] external_deps = [ - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/dynamic_loader_ohos_test/BUILD.gn b/test/unittest/dynamic_loader_ohos_test/BUILD.gn index b2fad2f874..d5f8a39cc2 100644 --- a/test/unittest/dynamic_loader_ohos_test/BUILD.gn +++ b/test/unittest/dynamic_loader_ohos_test/BUILD.gn @@ -53,10 +53,7 @@ ohos_unittest("dynamic_loader_ohos_test") { "ability_base:base", "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/ecological_rule_interceptor_test/BUILD.gn b/test/unittest/ecological_rule_interceptor_test/BUILD.gn index 98b65123a5..20077ef09c 100644 --- a/test/unittest/ecological_rule_interceptor_test/BUILD.gn +++ b/test/unittest/ecological_rule_interceptor_test/BUILD.gn @@ -47,6 +47,7 @@ ohos_unittest("ecological_rule_interceptor_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -61,7 +62,6 @@ ohos_unittest("ecological_rule_interceptor_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/exit_reason_test/BUILD.gn b/test/unittest/exit_reason_test/BUILD.gn index c2a416e1a7..7cb53ddfa5 100644 --- a/test/unittest/exit_reason_test/BUILD.gn +++ b/test/unittest/exit_reason_test/BUILD.gn @@ -48,6 +48,8 @@ ohos_unittest("exit_reason_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } 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_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", @@ -60,8 +62,6 @@ ohos_unittest("exit_reason_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/extension_control_interceptor_test/BUILD.gn b/test/unittest/extension_control_interceptor_test/BUILD.gn index c2abd8c2fc..16b45245df 100644 --- a/test/unittest/extension_control_interceptor_test/BUILD.gn +++ b/test/unittest/extension_control_interceptor_test/BUILD.gn @@ -46,6 +46,7 @@ ohos_unittest("extension_control_interceptor_test") { "${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", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -57,7 +58,6 @@ ohos_unittest("extension_control_interceptor_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/extension_record_factory_test/BUILD.gn b/test/unittest/extension_record_factory_test/BUILD.gn index 3894ad9a04..71978f07a9 100644 --- a/test/unittest/extension_record_factory_test/BUILD.gn +++ b/test/unittest/extension_record_factory_test/BUILD.gn @@ -52,7 +52,7 @@ ohos_unittest("extension_record_factory_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", "${ability_runtime_innerkits_path}/ability_manager:mission_info", - "${ability_runtime_native_path}/ability:ability_context_native", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${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", @@ -60,6 +60,7 @@ ohos_unittest("extension_record_factory_test") { "${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}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_path}/utils/global/freeze:freeze_util", @@ -76,7 +77,6 @@ ohos_unittest("extension_record_factory_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", @@ -99,7 +99,6 @@ ohos_unittest("extension_record_factory_test") { "napi:ace_napi", "relational_store:native_rdb", "samgr:samgr_proxy", - "samgr:samgr_proxy", "window_manager:libwsutils", ] diff --git a/test/unittest/extension_record_test/BUILD.gn b/test/unittest/extension_record_test/BUILD.gn index 4b64f621e8..89df4207b8 100644 --- a/test/unittest/extension_record_test/BUILD.gn +++ b/test/unittest/extension_record_test/BUILD.gn @@ -49,6 +49,8 @@ ohos_unittest("extension_record_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } 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_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", @@ -61,8 +63,6 @@ ohos_unittest("extension_record_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/extract_insight_intent_profile_test/BUILD.gn b/test/unittest/extract_insight_intent_profile_test/BUILD.gn index b4399a1039..0c468d0036 100644 --- a/test/unittest/extract_insight_intent_profile_test/BUILD.gn +++ b/test/unittest/extract_insight_intent_profile_test/BUILD.gn @@ -33,12 +33,14 @@ ohos_unittest("extract_insight_intent_profile_test") { sources = [ "extract_insight_intent_profile_test.cpp" ] - deps = [ "${ability_runtime_abilitymgr_path}/:abilityms" ] + deps = [ + "${ability_runtime_abilitymgr_path}/:abilityms", + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:libappexecfwk_common", "c_utils:utils", diff --git a/test/unittest/fault_data/BUILD.gn b/test/unittest/fault_data/BUILD.gn index 74a123db90..8c8497a3ff 100644 --- a/test/unittest/fault_data/BUILD.gn +++ b/test/unittest/fault_data/BUILD.gn @@ -35,6 +35,7 @@ ohos_unittest("fault_data_test") { sources = [ "fault_data_test.cpp" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", ] @@ -44,7 +45,6 @@ ohos_unittest("fault_data_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/foreground_app_connection_manager_test/BUILD.gn b/test/unittest/foreground_app_connection_manager_test/BUILD.gn index fae07aa7da..091d0cec79 100644 --- a/test/unittest/foreground_app_connection_manager_test/BUILD.gn +++ b/test/unittest/foreground_app_connection_manager_test/BUILD.gn @@ -40,6 +40,7 @@ ohos_unittest("foreground_app_connection_manager_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/foreground_app_obs_manager:foreground_app_obs_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -53,7 +54,6 @@ ohos_unittest("foreground_app_connection_manager_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "c_utils:utils", "common_event_service:cesfwk_innerkits", "ffrt:libffrt", diff --git a/test/unittest/foreground_app_connection_test/BUILD.gn b/test/unittest/foreground_app_connection_test/BUILD.gn index 9c23dceb17..477d54b366 100644 --- a/test/unittest/foreground_app_connection_test/BUILD.gn +++ b/test/unittest/foreground_app_connection_test/BUILD.gn @@ -42,8 +42,11 @@ ohos_unittest("foreground_app_connection_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } + deps = [ + "${ability_runtime_innerkits_path}/foreground_app_obs_manager:foreground_app_obs_manager", + ] + external_deps = [ - "ability_runtime:foreground_app_obs_manager", "access_token:libnativetoken", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", diff --git a/test/unittest/frameworks_kits_ability_native_test/BUILD.gn b/test/unittest/frameworks_kits_ability_native_test/BUILD.gn index 5e8b437230..331e32b35f 100644 --- a/test/unittest/frameworks_kits_ability_native_test/BUILD.gn +++ b/test/unittest/frameworks_kits_ability_native_test/BUILD.gn @@ -86,15 +86,18 @@ ohos_unittest("ability_test") { "${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_innerkits_path}/wantagent:wantagent_innerkits", "${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}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", - "${ability_runtime_native_path}/appkit:application_image_observer_manager", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/appkit:application_image_observer_manager", ] external_deps = [ @@ -104,22 +107,19 @@ ohos_unittest("ability_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_context_native", - "ability_runtime:runtime", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ffrt:libffrt", + "form_fwk:form_common_info", "form_fwk:form_manager", "form_fwk:form_render_info", - "form_fwk:form_common_info", "googletest:gmock_main", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", "input:libmmi-client", @@ -547,6 +547,7 @@ ohos_unittest("data_ability_operation_test") { configs = [ ":module_private_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", ] @@ -556,7 +557,6 @@ ohos_unittest("data_ability_operation_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "bundle_framework:appexecfwk_base", "c_utils:utils", "eventhandler:libeventhandler", @@ -649,14 +649,15 @@ ohos_unittest("ability_impl_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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_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}/appkit:app_context", - "${ability_runtime_native_path}/appkit:application_image_observer_manager", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/appkit:application_image_observer_manager", "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] @@ -666,15 +667,14 @@ ohos_unittest("ability_impl_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", @@ -715,16 +715,17 @@ ohos_unittest("ui_ability_impl_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_native_path}/ability:ability_context_native", + "${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:abilitykit_utils", "${ability_runtime_native_path}/ability/native:configuration_helper", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", - "${ability_runtime_native_path}/appkit:application_image_observer_manager", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/appkit:application_image_observer_manager", "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] @@ -734,15 +735,14 @@ ohos_unittest("ui_ability_impl_test") { "ability_base:extractortool", "ability_base:session_info", "ability_base:want", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", @@ -801,15 +801,16 @@ ohos_unittest("ability_thread_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/dataobs_manager:dataobs_manager", "${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:abilitykit_utils", "${ability_runtime_native_path}/ability/native:configuration_helper", "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/appkit:app_context", - "${ability_runtime_native_path}/appkit:application_image_observer_manager", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_native_path}/appkit:application_image_observer_manager", "${ability_runtime_services_path}/dataobsmgr:dataobsms_static", ] @@ -820,8 +821,6 @@ ohos_unittest("ability_thread_test") { "ability_base:extractresourcemanager", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -830,8 +829,8 @@ ohos_unittest("ability_thread_test") { "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", @@ -890,6 +889,7 @@ ohos_unittest("fa_ability_thread_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/dataobs_manager:dataobs_manager", "${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:abilitykit_utils", @@ -909,8 +909,6 @@ ohos_unittest("fa_ability_thread_test") { "ability_base:extractresourcemanager", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -919,8 +917,8 @@ ohos_unittest("fa_ability_thread_test") { "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", @@ -954,6 +952,7 @@ ohos_unittest("extension_ability_thread_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_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}/ability/native:abilitykit_utils", @@ -967,7 +966,6 @@ ohos_unittest("extension_ability_thread_test") { "ability_base:configuration", "ability_base:extractortool", "ability_base:want", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "c_utils:utils", "eventhandler:libeventhandler", @@ -1021,6 +1019,7 @@ ohos_unittest("ui_ability_thread_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/dataobs_manager:dataobs_manager", "${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:abilitykit_utils", @@ -1039,8 +1038,6 @@ ohos_unittest("ui_ability_thread_test") { "ability_base:extractortool", "ability_base:extractresourcemanager", "ability_base:want", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -1049,8 +1046,8 @@ ohos_unittest("ui_ability_thread_test") { "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", @@ -1089,6 +1086,8 @@ ohos_unittest("service_extension_module_loader_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_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}/ability/native:service_extension", "${ability_runtime_native_path}/appkit:app_context", @@ -1100,8 +1099,6 @@ ohos_unittest("service_extension_module_loader_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", @@ -1142,6 +1139,8 @@ ohos_unittest("ability_process_test") { deps = [ "${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_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", @@ -1153,8 +1152,6 @@ ohos_unittest("ability_process_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", @@ -1190,6 +1187,8 @@ ohos_unittest("extension_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_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}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:extensionkit_native", @@ -1203,8 +1202,6 @@ ohos_unittest("extension_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", @@ -1244,6 +1241,8 @@ ohos_unittest("extension_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}/deps_wrapper:ability_deps_wrapper", + "${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", @@ -1257,8 +1256,6 @@ ohos_unittest("extension_second_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", @@ -1296,6 +1293,8 @@ ohos_unittest("form_extension_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_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}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:form_extension", @@ -1309,15 +1308,13 @@ ohos_unittest("form_extension_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:form_common_info", "form_fwk:form_manager", "form_fwk:form_render_info", - "form_fwk:form_common_info", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", @@ -1352,6 +1349,7 @@ ohos_unittest("ability_thread_call_request_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_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}/ability/native:abilitykit_utils", @@ -1364,7 +1362,6 @@ ohos_unittest("ability_thread_call_request_test") { "ability_base:extractresourcemanager", "ability_base:want", "ability_base:zuri", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", @@ -1401,6 +1398,7 @@ ohos_unittest("form_extension_provider_client_test") { 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:abilitykit_native", "${ability_runtime_native_path}/ability/native:form_extension", "${ability_runtime_native_path}/appkit:app_context", @@ -1409,16 +1407,15 @@ ohos_unittest("form_extension_provider_client_test") { external_deps = [ "ability_base:extractortool", "ability_base:want", - "ability_runtime:runtime", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", "eventhandler:libeventhandler", "form_fwk:fmskit_native", + "form_fwk:form_common_info", "form_fwk:form_manager", "form_fwk:form_render_info", - "form_fwk:form_common_info", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", @@ -1464,10 +1461,14 @@ ohos_unittest("data_ability_impl_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", + "${ability_runtime_innerkits_path}/napi_base_context:napi_base_context", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", "${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:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", @@ -1480,12 +1481,6 @@ ohos_unittest("data_ability_impl_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_context_native", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", - "ability_runtime:napi_base_context", - "ability_runtime:runtime", - "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", @@ -1496,8 +1491,8 @@ ohos_unittest("data_ability_impl_test") { "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "init:libbegetutil", @@ -1543,6 +1538,7 @@ ohos_unittest("data_ability_impl_file_secondpart_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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:abilitykit_utils", @@ -1560,8 +1556,6 @@ ohos_unittest("data_ability_impl_file_secondpart_test") { "ability_base:extractresourcemanager", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -1569,8 +1563,8 @@ ohos_unittest("data_ability_impl_file_secondpart_test") { "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", @@ -1613,6 +1607,7 @@ ohos_unittest("data_ability_impl_file_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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:abilitykit_utils", @@ -1630,8 +1625,6 @@ ohos_unittest("data_ability_impl_file_test") { "ability_base:extractresourcemanager", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -1639,8 +1632,8 @@ ohos_unittest("data_ability_impl_file_test") { "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", @@ -1685,6 +1678,7 @@ ohos_unittest("ability_thread_dataability_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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:abilitykit_utils", @@ -1702,8 +1696,6 @@ ohos_unittest("ability_thread_dataability_test") { "ability_base:extractresourcemanager", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -1711,8 +1703,8 @@ ohos_unittest("ability_thread_dataability_test") { "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", @@ -1799,6 +1791,8 @@ ohos_unittest("extension_impl_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_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}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:extensionkit_native", @@ -1814,15 +1808,13 @@ ohos_unittest("extension_impl_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "form_fwk:form_common_info", "form_fwk:form_manager", "form_fwk:form_render_info", - "form_fwk:form_common_info", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", @@ -1935,11 +1927,14 @@ ohos_unittest("ui_ability_test") { "${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_innerkits_path}/wantagent:wantagent_innerkits", "${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}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", @@ -1953,9 +1948,6 @@ ohos_unittest("ui_ability_test") { "ability_base:extractortool", "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_context_native", - "ability_runtime:runtime", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -1964,8 +1956,8 @@ ohos_unittest("ui_ability_test") { "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", @@ -1993,12 +1985,14 @@ ohos_unittest("data_ability_result_test") { configs = [ ":module_private_config" ] - deps = [ "${ability_runtime_native_path}/ability/native:abilitykit_native" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_native_path}/ability/native:abilitykit_native", + ] external_deps = [ "ability_base:extractortool", "ability_base:zuri", - "ability_runtime:ability_manager", "c_utils:utils", "googletest:gtest_main", "hilog:libhilog", @@ -2035,6 +2029,7 @@ ohos_unittest("form_host_client_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", @@ -2049,21 +2044,19 @@ ohos_unittest("form_host_client_test") { "ability_base:configuration", "ability_base:extractortool", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", "eventhandler:libeventhandler", "ffrt:libffrt", "form_fwk:fmskit_native", + "form_fwk:form_common_info", "form_fwk:form_manager", "form_fwk:form_render_info", - "form_fwk:form_common_info", "googletest:gmock_main", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "i18n:intl_util", "init:libbegetutil", @@ -2096,6 +2089,7 @@ ohos_unittest("continuation_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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:abilitykit_utils", @@ -2113,7 +2107,6 @@ ohos_unittest("continuation_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -2122,8 +2115,8 @@ ohos_unittest("continuation_test") { "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", @@ -2160,13 +2153,16 @@ ohos_unittest("ability_transaction_callback_info_test") { configs = [ ":module_private_config" ] + deps = [ + "${ability_runtime_innerkits_path}/runtime:runtime", + ] + external_deps = [ "ability_base:base", "ability_base:configuration", "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "c_utils:utils", "eventhandler:libeventhandler", @@ -2327,10 +2323,13 @@ ohos_unittest("ability_window_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", "${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:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", @@ -2343,9 +2342,6 @@ ohos_unittest("ability_window_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_context_native", - "ability_runtime:runtime", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -2356,8 +2352,8 @@ ohos_unittest("ability_window_test") { "googletest:gtest_main", "graphic_2d:librender_service_base", "graphic_2d:librender_service_client", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "image_framework:image", "init:libbegetutil", @@ -2402,11 +2398,14 @@ ohos_unittest("ability_handler_test") { configs = [ ":module_private_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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:abilitykit_utils", "${ability_runtime_native_path}/ability/native:configuration_helper", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:app_context_utils", "${ability_runtime_native_path}/appkit:appkit_manager_helper", @@ -2419,9 +2418,6 @@ ohos_unittest("ability_handler_test") { "ability_base:configuration", "ability_base:extractortool", "ability_base:want", - "ability_runtime:ability_context_native", - "ability_runtime:ability_manager", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -2429,8 +2425,8 @@ ohos_unittest("ability_handler_test") { "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", @@ -2465,12 +2461,16 @@ ohos_unittest("ability_impl_factory_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/dataobs_manager:dataobs_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", + "${ability_runtime_innerkits_path}/napi_base_context:napi_base_context", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", "${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:abilitykit_utils", "${ability_runtime_native_path}/ability/native:configuration_helper", "${ability_runtime_native_path}/ability/native:continuation_ipc", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:app_context_utils", "${ability_runtime_native_path}/appkit:appkit_delegator", @@ -2486,11 +2486,6 @@ ohos_unittest("ability_impl_factory_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_context_native", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:napi_base_context", - "ability_runtime:runtime", - "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", @@ -2498,8 +2493,8 @@ ohos_unittest("ability_impl_factory_test") { "common_event_service:cesfwk_innerkits", "ffrt:libffrt", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "init:libbegetutil", @@ -2748,16 +2743,15 @@ ohos_unittest("ability_connection_manager_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:ability_context_native", + "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", ] external_deps = [ "ability_base:extractortool", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:runtime", "access_token:libaccesstoken_sdk", "access_token:libtoken_callback_sdk", "bundle_framework:appexecfwk_base", @@ -2798,8 +2792,11 @@ ohos_unittest("abilityruntime_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + deps = [ + "${ability_runtime_innerkits_path}/runtime:runtime", + ] + external_deps = [ - "ability_runtime:runtime", "c_utils:utils", "eventhandler:libeventhandler", "googletest:gmock_main", @@ -2829,20 +2826,20 @@ ohos_unittest("form_extension_module_loader_test") { deps = [ "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:form_extension", ] external_deps = [ "ability_base:configuration", "ability_base:session_info", - "ability_runtime:extensionkit_native", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", "form_fwk:fmskit_native", + "form_fwk:form_common_info", "form_fwk:form_manager", "form_fwk:form_render_info", - "form_fwk:form_common_info", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", @@ -3267,6 +3264,8 @@ ohos_unittest("app_service_extension_module_loader_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_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}/ability/native:app_service_extension", "${ability_runtime_native_path}/appkit:app_context", @@ -3278,8 +3277,6 @@ ohos_unittest("app_service_extension_module_loader_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", @@ -3325,6 +3322,7 @@ ohos_unittest("js_ui_extension_Callback_test") { 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_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability/native:abilitykit_native", @@ -3336,8 +3334,6 @@ ohos_unittest("js_ui_extension_Callback_test") { "ability_base:extractortool", "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:app_manager", "ace_engine:ace_uicontent", "c_utils:utils", "eventhandler:libeventhandler", @@ -3429,11 +3425,14 @@ ohos_unittest("ability_second_test") { "${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_innerkits_path}/wantagent:wantagent_innerkits", "${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}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_native_path}/appkit:appkit_native", @@ -3447,22 +3446,19 @@ ohos_unittest("ability_second_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_context_native", - "ability_runtime:runtime", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ffrt:libffrt", + "form_fwk:form_common_info", "form_fwk:form_manager", "form_fwk:form_render_info", - "form_fwk:form_common_info", "googletest:gmock_main", "googletest:gtest_main", - "hilog:libhilog", "hichecker:libhichecker", + "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", "input:libmmi-client", diff --git a/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn b/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn index 5e8a94cf25..63b8c23c69 100644 --- a/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn +++ b/test/unittest/frameworks_kits_appkit_native_test/BUILD.gn @@ -78,6 +78,7 @@ ohos_unittest("application_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", @@ -94,7 +95,6 @@ ohos_unittest("application_test") { "ability_base:configuration", "ability_base:extractortool", "ability_base:want", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -149,6 +149,7 @@ ohos_unittest("context_impl_test") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_innerkits_path}/error_utils:ability_runtime_error_util", + "${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:abilitykit_utils", @@ -168,7 +169,6 @@ ohos_unittest("context_impl_test") { "ability_base:configuration", "ability_base:extractortool", "ability_base:want", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -216,6 +216,7 @@ ohos_unittest("context_impl_second_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", @@ -232,7 +233,6 @@ ohos_unittest("context_impl_second_test") { "ability_base:configuration", "ability_base:extractortool", "ability_base:want", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -280,6 +280,7 @@ ohos_unittest("context_impl_third_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", @@ -296,7 +297,6 @@ ohos_unittest("context_impl_third_test") { "ability_base:configuration", "ability_base:extractortool", "ability_base:want", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -339,6 +339,7 @@ ohos_unittest("context_container_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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:abilitykit_utils", @@ -353,7 +354,6 @@ ohos_unittest("context_container_test") { "ability_base:configuration", "ability_base:want", "ability_base:zuri", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -409,6 +409,7 @@ ohos_unittest("overlay_event_subscriber_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", "${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_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", @@ -420,7 +421,6 @@ ohos_unittest("overlay_event_subscriber_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", @@ -478,6 +478,7 @@ ohos_unittest("dump_ffrt_helper_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", "${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_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", @@ -488,7 +489,6 @@ ohos_unittest("dump_ffrt_helper_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", @@ -543,6 +543,7 @@ ohos_unittest("context_deal_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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:abilitykit_utils", @@ -558,7 +559,6 @@ ohos_unittest("context_deal_test") { "ability_base:configuration", "ability_base:want", "ability_base:zuri", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -613,6 +613,7 @@ ohos_unittest("application_impl_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting", "${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_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", @@ -626,7 +627,6 @@ ohos_unittest("application_impl_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", @@ -709,6 +709,7 @@ ohos_unittest("ability_stage_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", @@ -723,7 +724,6 @@ ohos_unittest("ability_stage_test") { "ability_base:configuration", "ability_base:extractortool", "ability_base:want", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -761,6 +761,7 @@ ohos_unittest("form_extension_context_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", "${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/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", @@ -776,7 +777,6 @@ ohos_unittest("form_extension_context_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -826,6 +826,7 @@ ohos_unittest("bms_context_impl_test") { "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", @@ -836,7 +837,6 @@ ohos_unittest("bms_context_impl_test") { "ability_base:base", "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -869,6 +869,7 @@ ohos_unittest("context_container_by_mock_bms_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_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:app_context", @@ -879,7 +880,6 @@ ohos_unittest("context_container_by_mock_bms_test") { "ability_base:configuration", "ability_base:want", "ability_base:zuri", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -913,6 +913,7 @@ ohos_unittest("assert_fault_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/appkit:appkit_native", ] @@ -920,7 +921,6 @@ ohos_unittest("assert_fault_test") { "ability_base:base", "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "c_utils:utils", "eventhandler:libeventhandler", "ffrt:libffrt", @@ -949,10 +949,12 @@ ohos_unittest("dump_ipc_helper_test") { configs = [ ":module_context_config" ] - deps = [ "${ability_runtime_native_path}/appkit:appkit_native" ] + deps = [ + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_native_path}/appkit:appkit_native", + ] external_deps = [ - "ability_runtime:runtime", "c_utils:utils", "googletest:gtest_main", "hilog:libhilog", @@ -978,12 +980,12 @@ ohos_unittest("dump_runtime_helper_test") { deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/appkit:appkit_native", ] external_deps = [ - "ability_runtime:runtime", "c_utils:utils", "faultloggerd:dfx_signalhandler", "faultloggerd:libfaultloggerd", @@ -1015,6 +1017,7 @@ ohos_unittest("extension_plugin_info_test") { ] deps = [ + "${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}/appkit:appkit_native", @@ -1022,7 +1025,6 @@ ohos_unittest("extension_plugin_info_test") { external_deps = [ "ability_base:string_utils", - "ability_runtime:runtime", "c_utils:utils", "googletest:gtest_main", "hilog:libhilog", @@ -1041,10 +1043,12 @@ ohos_unittest("idle_time_test") { configs = [ ":module_context_config" ] - deps = [ "${ability_runtime_native_path}/appkit:appkit_native" ] + deps = [ + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_native_path}/appkit:appkit_native", + ] external_deps = [ - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", @@ -1077,12 +1081,12 @@ ohos_unittest("dump_runtime_helper_second_test") { deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/appkit:appkit_native", ] external_deps = [ - "ability_runtime:runtime", "c_utils:utils", "ets_runtime:libark_jsruntime", "faultloggerd:dfx_signalhandler", @@ -1118,6 +1122,7 @@ ohos_unittest("native_lib_util_test") { deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_services_path}/common:app_util", @@ -1125,7 +1130,6 @@ ohos_unittest("native_lib_util_test") { external_deps = [ "ability_base:extractresourcemanager", - "ability_runtime:runtime", "c_utils:utils", "faultloggerd:libfaultloggerd", "googletest:gtest_main", @@ -1242,6 +1246,7 @@ ohos_unittest("startup_manager_test") { deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_services_path}/common:app_util", @@ -1250,7 +1255,6 @@ ohos_unittest("startup_manager_test") { external_deps = [ "ability_base:extractortool", "ability_base:zuri", - "ability_runtime:runtime", "c_utils:utils", "config_policy:configpolicy_util", "eventhandler:libeventhandler", @@ -1304,6 +1308,7 @@ ohos_unittest("startup_manager_mock_test") { deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_services_path}/common:app_util", @@ -1311,7 +1316,6 @@ ohos_unittest("startup_manager_mock_test") { external_deps = [ "ability_base:zuri", - "ability_runtime:runtime", "c_utils:utils", "config_policy:configpolicy_util", "eventhandler:libeventhandler", diff --git a/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/BUILD.gn b/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/BUILD.gn index 6a5728461d..66eefb86e3 100644 --- a/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/BUILD.gn +++ b/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/BUILD.gn @@ -96,6 +96,7 @@ ohos_unittest("iability_monitor_unittest") { configs += [ "${ability_runtime_services_path}/common:common_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_delegator", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -103,7 +104,6 @@ ohos_unittest("iability_monitor_unittest") { external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", "c_utils:utils", "eventhandler:libeventhandler", "googletest:gmock", @@ -126,7 +126,9 @@ ohos_unittest("ability_delegator_unittest") { configs += [ "${ability_runtime_services_path}/common:common_config" ] 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}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_delegator", "${ability_runtime_native_path}/appkit:appkit_native", @@ -136,8 +138,6 @@ ohos_unittest("ability_delegator_unittest") { external_deps = [ "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:runtime", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", @@ -192,6 +192,7 @@ ohos_unittest("ability_delegator_registry_unittest") { 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:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_delegator", @@ -201,8 +202,6 @@ ohos_unittest("ability_delegator_registry_unittest") { external_deps = [ "ability_base:extractortool", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:runtime", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", @@ -227,7 +226,9 @@ ohos_unittest("js_test_runner_unittest") { configs += [ "${ability_runtime_services_path}/common:common_config" ] 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:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_delegator", @@ -239,8 +240,6 @@ ohos_unittest("js_test_runner_unittest") { "ability_base:configuration", "ability_base:extractortool", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/hidden_start_utils_test/BUILD.gn b/test/unittest/hidden_start_utils_test/BUILD.gn index 95047d77cd..c24aebf93f 100644 --- a/test/unittest/hidden_start_utils_test/BUILD.gn +++ b/test/unittest/hidden_start_utils_test/BUILD.gn @@ -34,14 +34,13 @@ ohos_unittest("hidden_start_utils_test") { configs = [] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:process_options", "${ability_runtime_innerkits_path}/ability_manager:start_window_option", ] external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:start_window_option", "c_utils:utils", "googletest:gmock_main", "googletest:gtest_main", diff --git a/test/unittest/insight_intent/insight_intent_execute_callback_stub_test/BUILD.gn b/test/unittest/insight_intent/insight_intent_execute_callback_stub_test/BUILD.gn index bfaeadce00..9a7f17cd59 100644 --- a/test/unittest/insight_intent/insight_intent_execute_callback_stub_test/BUILD.gn +++ b/test/unittest/insight_intent/insight_intent_execute_callback_stub_test/BUILD.gn @@ -40,6 +40,7 @@ ohos_unittest("insight_intent_execute_callback_stub_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/common:app_util", ] @@ -47,8 +48,6 @@ ohos_unittest("insight_intent_execute_callback_stub_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "bundle_framework:libappexecfwk_common", "c_utils:utils", "eventhandler:libeventhandler", 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 16e344071b..be52a9c4f8 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 @@ -50,6 +50,8 @@ 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}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/common:app_util", @@ -59,8 +61,6 @@ ohos_unittest("insight_intent_execute_manager_second_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "bundle_framework:libappexecfwk_common", "c_utils:utils", "ffrt:libffrt", 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 3ed2538cd9..3865734036 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 @@ -42,18 +42,18 @@ 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}/appkit:appkit_manager_helper", - "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/abilitymgr:abilityms", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "bundle_framework:libappexecfwk_common", "c_utils:utils", "ffrt:libffrt", diff --git a/test/unittest/insight_intent/insight_intent_execute_param_second_test/BUILD.gn b/test/unittest/insight_intent/insight_intent_execute_param_second_test/BUILD.gn index 6456a0ce74..82b6c9e11a 100644 --- a/test/unittest/insight_intent/insight_intent_execute_param_second_test/BUILD.gn +++ b/test/unittest/insight_intent/insight_intent_execute_param_second_test/BUILD.gn @@ -34,14 +34,15 @@ ohos_unittest("insight_intent_execute_param_second_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", + ] external_deps = [ "ability_base:base", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "bundle_framework:libappexecfwk_common", "c_utils:utils", "ffrt:libffrt", diff --git a/test/unittest/insight_intent/insight_intent_execute_param_test/BUILD.gn b/test/unittest/insight_intent/insight_intent_execute_param_test/BUILD.gn index 0ee76b8de0..8629fd92e2 100644 --- a/test/unittest/insight_intent/insight_intent_execute_param_test/BUILD.gn +++ b/test/unittest/insight_intent/insight_intent_execute_param_test/BUILD.gn @@ -31,14 +31,15 @@ ohos_unittest("insight_intent_execute_param_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", + ] external_deps = [ "ability_base:base", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "bundle_framework:libappexecfwk_common", "c_utils:utils", "ffrt:libffrt", diff --git a/test/unittest/insight_intent/insight_intent_execute_result_test/BUILD.gn b/test/unittest/insight_intent/insight_intent_execute_result_test/BUILD.gn index 88d635a3e4..75628bf153 100644 --- a/test/unittest/insight_intent/insight_intent_execute_result_test/BUILD.gn +++ b/test/unittest/insight_intent/insight_intent_execute_result_test/BUILD.gn @@ -31,14 +31,15 @@ ohos_unittest("insight_intent_execute_result_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", + ] external_deps = [ "ability_base:base", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "bundle_framework:libappexecfwk_common", "c_utils:utils", "ffrt:libffrt", diff --git a/test/unittest/insight_intent/insight_intent_executor_test/BUILD.gn b/test/unittest/insight_intent/insight_intent_executor_test/BUILD.gn index eff5560e31..23c025ca2d 100644 --- a/test/unittest/insight_intent/insight_intent_executor_test/BUILD.gn +++ b/test/unittest/insight_intent/insight_intent_executor_test/BUILD.gn @@ -39,6 +39,8 @@ ohos_unittest("insight_intent_executor_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability/native:insight_intent_executor", @@ -51,8 +53,6 @@ ohos_unittest("insight_intent_executor_test") { "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "bundle_framework:libappexecfwk_common", "c_utils:utils", "ffrt:libffrt", diff --git a/test/unittest/insight_intent/insight_intent_sys_event_receiver_test/BUILD.gn b/test/unittest/insight_intent/insight_intent_sys_event_receiver_test/BUILD.gn index 34d0981167..d50b5f652a 100644 --- a/test/unittest/insight_intent/insight_intent_sys_event_receiver_test/BUILD.gn +++ b/test/unittest/insight_intent/insight_intent_sys_event_receiver_test/BUILD.gn @@ -49,6 +49,8 @@ ohos_unittest("insight_intent_sys_event_receiver_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/common:app_util", ] @@ -56,8 +58,6 @@ ohos_unittest("insight_intent_sys_event_receiver_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "bundle_framework:libappexecfwk_common", "c_utils:utils", "config_policy:configpolicy_util", diff --git a/test/unittest/insight_intent/insight_intent_utils_test/BUILD.gn b/test/unittest/insight_intent/insight_intent_utils_test/BUILD.gn index e051927c4a..145c1d9d60 100644 --- a/test/unittest/insight_intent/insight_intent_utils_test/BUILD.gn +++ b/test/unittest/insight_intent/insight_intent_utils_test/BUILD.gn @@ -58,7 +58,6 @@ ohos_unittest("insight_intent_utils_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/insight_intent/js_insight_intent_entry_second_test/BUILD.gn b/test/unittest/insight_intent/js_insight_intent_entry_second_test/BUILD.gn index cfc7adaa86..42dc7585de 100644 --- a/test/unittest/insight_intent/js_insight_intent_entry_second_test/BUILD.gn +++ b/test/unittest/insight_intent/js_insight_intent_entry_second_test/BUILD.gn @@ -40,6 +40,8 @@ ohos_unittest("js_insight_intent_entry_second_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability/native:insight_intent_executor", @@ -48,13 +50,10 @@ ohos_unittest("js_insight_intent_entry_second_test") { ] external_deps = [ - "ability_base:extractortool", "ability_base:base", + "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", - "ability_runtime:js_environment", "bundle_framework:libappexecfwk_common", "c_utils:utils", "ffrt:libffrt", diff --git a/test/unittest/insight_intent/js_insight_intent_entry_test/BUILD.gn b/test/unittest/insight_intent/js_insight_intent_entry_test/BUILD.gn index ab4d2ff41f..5cf9c38e55 100644 --- a/test/unittest/insight_intent/js_insight_intent_entry_test/BUILD.gn +++ b/test/unittest/insight_intent/js_insight_intent_entry_test/BUILD.gn @@ -32,6 +32,8 @@ ohos_unittest("js_insight_intent_entry_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability/native:insight_intent_executor", "${ability_runtime_native_path}/insight_intent/insight_intent_context:insightintentcontext", @@ -39,12 +41,10 @@ ohos_unittest("js_insight_intent_entry_test") { ] external_deps = [ - "ability_base:extractortool", "ability_base:base", + "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "bundle_framework:libappexecfwk_common", "c_utils:utils", "ffrt:libffrt", diff --git a/test/unittest/insight_intent/js_insight_intent_func_second_test/BUILD.gn b/test/unittest/insight_intent/js_insight_intent_func_second_test/BUILD.gn index 963b30bd38..200384079a 100644 --- a/test/unittest/insight_intent/js_insight_intent_func_second_test/BUILD.gn +++ b/test/unittest/insight_intent/js_insight_intent_func_second_test/BUILD.gn @@ -39,6 +39,8 @@ ohos_unittest("js_insight_intent_func_second_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability/native:insight_intent_executor", @@ -47,13 +49,10 @@ ohos_unittest("js_insight_intent_func_second_test") { ] external_deps = [ - "ability_base:extractortool", "ability_base:base", + "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", - "ability_runtime:js_environment", "bundle_framework:libappexecfwk_common", "c_utils:utils", "ffrt:libffrt", diff --git a/test/unittest/insight_intent/js_insight_intent_func_test/BUILD.gn b/test/unittest/insight_intent/js_insight_intent_func_test/BUILD.gn index 1c3fab5f66..40248b1093 100644 --- a/test/unittest/insight_intent/js_insight_intent_func_test/BUILD.gn +++ b/test/unittest/insight_intent/js_insight_intent_func_test/BUILD.gn @@ -32,6 +32,8 @@ ohos_unittest("js_insight_intent_func_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability/native:insight_intent_executor", "${ability_runtime_native_path}/insight_intent/insight_intent_context:insightintentcontext", @@ -39,12 +41,10 @@ ohos_unittest("js_insight_intent_func_test") { ] external_deps = [ - "ability_base:extractortool", "ability_base:base", + "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "bundle_framework:libappexecfwk_common", "c_utils:utils", "ffrt:libffrt", diff --git a/test/unittest/insight_intent/js_insight_intent_page_second_test/BUILD.gn b/test/unittest/insight_intent/js_insight_intent_page_second_test/BUILD.gn index 8d3fb6b79e..70c25335d4 100644 --- a/test/unittest/insight_intent/js_insight_intent_page_second_test/BUILD.gn +++ b/test/unittest/insight_intent/js_insight_intent_page_second_test/BUILD.gn @@ -39,6 +39,8 @@ ohos_unittest("js_insight_intent_page_second_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_native_path}/ability/native:insight_intent_executor", @@ -47,12 +49,10 @@ ohos_unittest("js_insight_intent_page_second_test") { ] external_deps = [ - "ability_base:extractortool", "ability_base:base", + "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "bundle_framework:libappexecfwk_common", "c_utils:utils", "ffrt:libffrt", diff --git a/test/unittest/insight_intent/js_insight_intent_page_test/BUILD.gn b/test/unittest/insight_intent/js_insight_intent_page_test/BUILD.gn index f5942ead9f..8d44d2139c 100644 --- a/test/unittest/insight_intent/js_insight_intent_page_test/BUILD.gn +++ b/test/unittest/insight_intent/js_insight_intent_page_test/BUILD.gn @@ -32,6 +32,8 @@ ohos_unittest("js_insight_intent_page_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability/native:insight_intent_executor", "${ability_runtime_native_path}/insight_intent/insight_intent_context:insightintentcontext", @@ -39,12 +41,10 @@ ohos_unittest("js_insight_intent_page_test") { ] external_deps = [ - "ability_base:extractortool", "ability_base:base", + "ability_base:extractortool", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "bundle_framework:libappexecfwk_common", "c_utils:utils", "ffrt:libffrt", diff --git a/test/unittest/insight_intent/js_insight_intent_utils_test/BUILD.gn b/test/unittest/insight_intent/js_insight_intent_utils_test/BUILD.gn index 7e13a9f93d..b6e80febf8 100644 --- a/test/unittest/insight_intent/js_insight_intent_utils_test/BUILD.gn +++ b/test/unittest/insight_intent/js_insight_intent_utils_test/BUILD.gn @@ -32,6 +32,8 @@ ohos_unittest("js_insight_intent_utils_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability/native:insight_intent_executor", "${ability_runtime_native_path}/insight_intent/insight_intent_context:insightintentcontext", @@ -42,8 +44,6 @@ ohos_unittest("js_insight_intent_utils_test") { "ability_base:base", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "bundle_framework:libappexecfwk_common", "c_utils:utils", "eventhandler:libeventhandler", diff --git a/test/unittest/insight_intent_db_cache_test/BUILD.gn b/test/unittest/insight_intent_db_cache_test/BUILD.gn index 2b90d42db7..b063323d51 100644 --- a/test/unittest/insight_intent_db_cache_test/BUILD.gn +++ b/test/unittest/insight_intent_db_cache_test/BUILD.gn @@ -38,12 +38,14 @@ ohos_unittest("insight_intent_db_cache_test") { "mock_insight_intent_rdb_storage_mgr.cpp", ] - deps = [ "${ability_runtime_abilitymgr_path}/:abilityms" ] + deps = [ + "${ability_runtime_abilitymgr_path}/:abilityms", + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:libappexecfwk_common", "c_utils:utils", diff --git a/test/unittest/insight_intent_profile_test/BUILD.gn b/test/unittest/insight_intent_profile_test/BUILD.gn index 2b09abb2b6..c7bcb54e47 100644 --- a/test/unittest/insight_intent_profile_test/BUILD.gn +++ b/test/unittest/insight_intent_profile_test/BUILD.gn @@ -32,12 +32,14 @@ ohos_unittest("insight_intent_profile_test") { sources = [ "insight_intent_profile_test.cpp" ] - deps = [ "${ability_runtime_abilitymgr_path}/:abilityms" ] + deps = [ + "${ability_runtime_abilitymgr_path}/:abilityms", + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:libappexecfwk_common", "c_utils:utils", diff --git a/test/unittest/insight_intent_rdb_data_manager_test/BUILD.gn b/test/unittest/insight_intent_rdb_data_manager_test/BUILD.gn index 7c16d94a8a..3baa9bf5cb 100755 --- a/test/unittest/insight_intent_rdb_data_manager_test/BUILD.gn +++ b/test/unittest/insight_intent_rdb_data_manager_test/BUILD.gn @@ -37,12 +37,14 @@ ohos_unittest("insight_intent_rdb_data_manager_test") { "insight_intent_rdb_data_manager_test.cpp" ] - deps = [ "${ability_runtime_abilitymgr_path}/:abilityms" ] + deps = [ + "${ability_runtime_abilitymgr_path}/:abilityms", + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:libappexecfwk_common", "c_utils:utils", diff --git a/test/unittest/insight_intent_rdb_storage_mgr_test/BUILD.gn b/test/unittest/insight_intent_rdb_storage_mgr_test/BUILD.gn index 8b28618d4d..1218291b02 100644 --- a/test/unittest/insight_intent_rdb_storage_mgr_test/BUILD.gn +++ b/test/unittest/insight_intent_rdb_storage_mgr_test/BUILD.gn @@ -39,12 +39,14 @@ ohos_unittest("insight_intent_rdb_storage_mgr_test") { "mock_insight_intent_rdb_data_mgr.cpp", ] - deps = [ "${ability_runtime_abilitymgr_path}/:abilityms" ] + deps = [ + "${ability_runtime_abilitymgr_path}/:abilityms", + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:libappexecfwk_common", "c_utils:utils", diff --git a/test/unittest/js_ability_context_test/BUILD.gn b/test/unittest/js_ability_context_test/BUILD.gn index b6e8bc80be..5cd9440b8a 100644 --- a/test/unittest/js_ability_context_test/BUILD.gn +++ b/test/unittest/js_ability_context_test/BUILD.gn @@ -40,18 +40,18 @@ ohos_unittest("js_ability_context_test") { 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_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:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", + "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment", "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:js_environment", - "ability_runtime:runtime", "c_utils:utils", "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", diff --git a/test/unittest/js_app_service_extension_test/BUILD.gn b/test/unittest/js_app_service_extension_test/BUILD.gn index 2159e983f5..ed16be2020 100644 --- a/test/unittest/js_app_service_extension_test/BUILD.gn +++ b/test/unittest/js_app_service_extension_test/BUILD.gn @@ -36,9 +36,14 @@ 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_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability/native:abilitykit_utils", "${ability_runtime_native_path}/ability/native:app_service_extension", + "${ability_runtime_native_path}/ability/native:extensionkit_native", "${ability_runtime_native_path}/ability/native:insight_intent_executor", + "${ability_runtime_native_path}/appkit:app_context", + "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_native_path}/insight_intent/insight_intent_context:insightintentcontext", "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] @@ -47,11 +52,6 @@ ohos_unittest("js_app_service_extension_test") { "ability_base:base", "ability_base:configuration", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:app_context", - "ability_runtime:appkit_native", - "ability_runtime:extensionkit_native", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/js_auto_fill_extension_test/BUILD.gn b/test/unittest/js_auto_fill_extension_test/BUILD.gn index 6f01f9ef16..b62ff0c156 100644 --- a/test/unittest/js_auto_fill_extension_test/BUILD.gn +++ b/test/unittest/js_auto_fill_extension_test/BUILD.gn @@ -33,9 +33,14 @@ ohos_unittest("js_auto_fill_extension_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] 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: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", ] external_deps = [ @@ -44,11 +49,6 @@ ohos_unittest("js_auto_fill_extension_test") { "ability_base:session_info", "ability_base:view_data", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:app_context", - "ability_runtime:appkit_native", - "ability_runtime:extensionkit_native", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/js_service_extension_test/BUILD.gn b/test/unittest/js_service_extension_test/BUILD.gn index a092e7ce7f..ba365581eb 100644 --- a/test/unittest/js_service_extension_test/BUILD.gn +++ b/test/unittest/js_service_extension_test/BUILD.gn @@ -36,8 +36,14 @@ 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_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/runtime:runtime", "${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:service_extension", + "${ability_runtime_native_path}/appkit:app_context", + "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_native_path}/insight_intent/insight_intent_context:insightintentcontext", "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] @@ -46,12 +52,6 @@ ohos_unittest("js_service_extension_test") { "ability_base:base", "ability_base:configuration", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:app_context", - "ability_runtime:appkit_native", - "ability_runtime:extensionkit_native", - "ability_runtime:runtime", - "ability_runtime:service_extension", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/js_ui_ability_test/BUILD.gn b/test/unittest/js_ui_ability_test/BUILD.gn index c160f27fac..4e4faee39e 100644 --- a/test/unittest/js_ui_ability_test/BUILD.gn +++ b/test/unittest/js_ui_ability_test/BUILD.gn @@ -45,15 +45,18 @@ ohos_unittest("js_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}/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:configuration_helper", "${ability_runtime_native_path}/ability/native:ui_extension", "${ability_runtime_native_path}/ability/native:uiabilitykit_native", + "${ability_runtime_native_path}/ability:ability_context_native", "${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}/js_environment/frameworks/js_environment:js_environment", "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_services_path}/common:app_util", @@ -61,9 +64,6 @@ ohos_unittest("js_ui_ability_test") { external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:js_environment", - "ability_runtime:runtime", "c_utils:utils", "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", 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 7c17a1810c..0be48f23fa 100644 --- a/test/unittest/js_ui_extension_content_session_test/BUILD.gn +++ b/test/unittest/js_ui_extension_content_session_test/BUILD.gn @@ -36,15 +36,21 @@ ohos_unittest("js_ui_extension_content_session_test") { ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", + "${ability_runtime_innerkits_path}/runtime:runtime", "${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:service_extension", "${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}/insight_intent/insight_intent_context:insightintentcontext", + "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment", ] external_deps = [ @@ -52,13 +58,6 @@ ohos_unittest("js_ui_extension_content_session_test") { "ability_base:configuration", "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:app_context", - "ability_runtime:appkit_native", - "ability_runtime:extensionkit_native", - "ability_runtime:js_environment", - "ability_runtime:runtime", - "ability_runtime:service_extension", "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", diff --git a/test/unittest/js_ui_extension_context_test/BUILD.gn b/test/unittest/js_ui_extension_context_test/BUILD.gn index b8ecd03ec6..9ed32177a0 100644 --- a/test/unittest/js_ui_extension_context_test/BUILD.gn +++ b/test/unittest/js_ui_extension_context_test/BUILD.gn @@ -40,20 +40,20 @@ ohos_unittest("js_ui_extension_context_test") { 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_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:extensionkit_native", "${ability_runtime_native_path}/ability/native:ui_extension", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", + "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment", "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:js_environment", - "ability_runtime:runtime", "c_utils:utils", "ets_runtime:libark_jsruntime", "ffrt:libffrt", diff --git a/test/unittest/js_ui_service_extension_connection_test/BUILD.gn b/test/unittest/js_ui_service_extension_connection_test/BUILD.gn index 7637d58d17..bee0d9a512 100644 --- a/test/unittest/js_ui_service_extension_connection_test/BUILD.gn +++ b/test/unittest/js_ui_service_extension_connection_test/BUILD.gn @@ -36,12 +36,14 @@ ohos_unittest("js_ui_service_extension_connection_test") { configs = [] - deps = [ "${ability_runtime_native_path}/ability/native:ui_service_extension_connection" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_native_path}/ability/native:ui_service_extension_connection", + ] external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:runtime", "c_utils:utils", "googletest:gmock_main", "googletest:gtest_main", 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 d0924883bd..0adf9b3b74 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 @@ -40,8 +40,8 @@ ohos_unittest("js_ui_service_extension_context_first_test") { "${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}/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:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", @@ -49,6 +49,7 @@ ohos_unittest("js_ui_service_extension_context_first_test") { "${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}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_path}/services/abilitymgr:abilityms_target", @@ -58,7 +59,6 @@ ohos_unittest("js_ui_service_extension_context_first_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "ace_engine:ace_uicontent", "c_utils:utils", "ets_runtime:libark_jsruntime", 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 66025c068e..85798612fc 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 @@ -37,8 +37,8 @@ ohos_unittest("js_ui_service_extension_context_second_test") { "${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}/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:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", @@ -46,6 +46,7 @@ ohos_unittest("js_ui_service_extension_context_second_test") { "${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}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_path}/services/abilitymgr:abilityms_target", @@ -55,7 +56,6 @@ ohos_unittest("js_ui_service_extension_context_second_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "ace_engine:ace_uicontent", "c_utils:utils", "ets_runtime:libark_jsruntime", diff --git a/test/unittest/js_ui_service_extension_test/BUILD.gn b/test/unittest/js_ui_service_extension_test/BUILD.gn index c6deef4af0..48d43c5d87 100644 --- a/test/unittest/js_ui_service_extension_test/BUILD.gn +++ b/test/unittest/js_ui_service_extension_test/BUILD.gn @@ -37,8 +37,8 @@ ohos_unittest("js_ui_service_extension_test") { "${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}/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:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", @@ -46,16 +46,16 @@ ohos_unittest("js_ui_service_extension_test") { "${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}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment", "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:js_environment", - "ability_runtime:runtime", "ace_engine:ace_uicontent", "c_utils:utils", "eventhandler:libeventhandler", 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 7c1470b857..00a14576f0 100644 --- a/test/unittest/js_ui_service_host_proxy_test/BUILD.gn +++ b/test/unittest/js_ui_service_host_proxy_test/BUILD.gn @@ -45,23 +45,23 @@ 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_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: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: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}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment", ] external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:js_environment", - "ability_runtime:runtime", "access_token:libtokenid_sdk", "ace_engine:ace_uicontent", "c_utils:utils", diff --git a/test/unittest/js_ui_service_proxy_test/BUILD.gn b/test/unittest/js_ui_service_proxy_test/BUILD.gn index 59c3484c33..cb13100b14 100644 --- a/test/unittest/js_ui_service_proxy_test/BUILD.gn +++ b/test/unittest/js_ui_service_proxy_test/BUILD.gn @@ -43,8 +43,8 @@ ohos_unittest("js_ui_service_proxy_test") { "${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}/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:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", @@ -52,16 +52,16 @@ ohos_unittest("js_ui_service_proxy_test") { "${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}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment", "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:js_environment", - "ability_runtime:runtime", "ace_engine:ace_uicontent", "c_utils:utils", "eventhandler:libeventhandler", diff --git a/test/unittest/js_uiservice_uiext_connection_test/BUILD.gn b/test/unittest/js_uiservice_uiext_connection_test/BUILD.gn index 17ff38d36f..33cb7264dd 100644 --- a/test/unittest/js_uiservice_uiext_connection_test/BUILD.gn +++ b/test/unittest/js_uiservice_uiext_connection_test/BUILD.gn @@ -39,14 +39,14 @@ ohos_unittest("js_uiservice_uiext_connection_test") { configs = [] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability/native:ui_extension", "${ability_runtime_native_path}/ability/native:ui_service_extension_connection", ] external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:runtime", "c_utils:utils", "ets_runtime:libark_jsruntime", "googletest:gmock_main", diff --git a/test/unittest/keep_alive_utils_test/BUILD.gn b/test/unittest/keep_alive_utils_test/BUILD.gn index c50d4e8aa8..759e301654 100644 --- a/test/unittest/keep_alive_utils_test/BUILD.gn +++ b/test/unittest/keep_alive_utils_test/BUILD.gn @@ -48,6 +48,7 @@ ohos_unittest("keep_alive_utils_test") { deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", ] @@ -57,7 +58,6 @@ ohos_unittest("keep_alive_utils_test") { "ability_base:configuration", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "appspawn:appspawn_client", "bundle_framework:appexecfwk_base", diff --git a/test/unittest/lifecycle_deal_test/BUILD.gn b/test/unittest/lifecycle_deal_test/BUILD.gn index feaa2648d4..d62b7e0e8e 100644 --- a/test/unittest/lifecycle_deal_test/BUILD.gn +++ b/test/unittest/lifecycle_deal_test/BUILD.gn @@ -39,6 +39,8 @@ ohos_unittest("lifecycle_deal_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", @@ -50,8 +52,6 @@ ohos_unittest("lifecycle_deal_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/local_pending_want_test/BUILD.gn b/test/unittest/local_pending_want_test/BUILD.gn index d6f4d6bd14..228f6000dd 100644 --- a/test/unittest/local_pending_want_test/BUILD.gn +++ b/test/unittest/local_pending_want_test/BUILD.gn @@ -33,12 +33,13 @@ ohos_unittest("local_pending_want_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [] + deps = [ + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", + ] external_deps = [ "ability_base:base", "ability_base:want", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/local_want_agent_info_test/BUILD.gn b/test/unittest/local_want_agent_info_test/BUILD.gn index 3d19edda32..09fa2ef412 100644 --- a/test/unittest/local_want_agent_info_test/BUILD.gn +++ b/test/unittest/local_want_agent_info_test/BUILD.gn @@ -33,12 +33,13 @@ ohos_unittest("local_want_agent_info_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [] + deps = [ + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", + ] external_deps = [ "ability_base:base", "ability_base:want", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/mission_data_storage_test/BUILD.gn b/test/unittest/mission_data_storage_test/BUILD.gn index f2c36458ea..c33bfa7f99 100755 --- a/test/unittest/mission_data_storage_test/BUILD.gn +++ b/test/unittest/mission_data_storage_test/BUILD.gn @@ -35,6 +35,7 @@ ohos_unittest("mission_data_storage_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -49,7 +50,6 @@ ohos_unittest("mission_data_storage_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "c_utils:utils", "common_event_service:cesfwk_innerkits", "ffrt:libffrt", diff --git a/test/unittest/mission_list_dump_test/BUILD.gn b/test/unittest/mission_list_dump_test/BUILD.gn index d4500063f6..986b205479 100644 --- a/test/unittest/mission_list_dump_test/BUILD.gn +++ b/test/unittest/mission_list_dump_test/BUILD.gn @@ -24,6 +24,7 @@ ohos_unittest("mission_list_dump_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", ] @@ -31,7 +32,6 @@ ohos_unittest("mission_list_dump_test") { external_deps = [ "ability_base:session_info", "ability_base:want", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/mission_list_manager_dump_test/BUILD.gn b/test/unittest/mission_list_manager_dump_test/BUILD.gn index 8d40631d6b..5628b28491 100644 --- a/test/unittest/mission_list_manager_dump_test/BUILD.gn +++ b/test/unittest/mission_list_manager_dump_test/BUILD.gn @@ -24,6 +24,7 @@ ohos_unittest("mission_list_manager_dump_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", ] @@ -31,7 +32,6 @@ ohos_unittest("mission_list_manager_dump_test") { external_deps = [ "ability_base:session_info", "ability_base:want", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/mission_list_manager_ut_test/BUILD.gn b/test/unittest/mission_list_manager_ut_test/BUILD.gn index 94f6bdb50f..059973f28b 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}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/runtime:runtime", "${ability_runtime_native_path}/ability/native:ability_thread", "${ability_runtime_native_path}/ability/native:abilitykit_native", @@ -53,7 +54,6 @@ ohos_unittest("mission_list_manager_ut_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn b/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn index be0fc606e5..0daac9e660 100644 --- a/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn +++ b/test/unittest/modal_system_app_freeze_uiextension_test/BUILD.gn @@ -42,22 +42,21 @@ ohos_unittest("modal_system_app_freeze_uiextension_test") { "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", + "${ability_runtime_services_path}/appmgr:libappms", + "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:perm_verification", + "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${ability_runtime_native_path}/appkit:appkit_native", - "${ability_runtime_path}/utils/server/startup:startup_util", - "${ability_runtime_services_path}/appmgr:libappms", - "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:task_handler_wrap", ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/unittest/modal_system_dialog_util_test/BUILD.gn b/test/unittest/modal_system_dialog_util_test/BUILD.gn index e3e2937f03..b37c90db0d 100644 --- a/test/unittest/modal_system_dialog_util_test/BUILD.gn +++ b/test/unittest/modal_system_dialog_util_test/BUILD.gn @@ -43,13 +43,16 @@ ohos_unittest("modal_system_dialog_util_test") { "modal_system_dialog_util_test.cpp", ] + deps = [ + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] + external_deps = [ "ability_base:base", "ability_base:configuration", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "appspawn:appspawn_client", "bundle_framework:appexecfwk_base", diff --git a/test/unittest/multi_app_utils_test/BUILD.gn b/test/unittest/multi_app_utils_test/BUILD.gn index 6cbb69ee75..14e2ed237c 100644 --- a/test/unittest/multi_app_utils_test/BUILD.gn +++ b/test/unittest/multi_app_utils_test/BUILD.gn @@ -41,9 +41,12 @@ ohos_unittest("multi_app_utils_test") { "src/mock_app_mgr_utils.cpp", ] + deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] + external_deps = [ "ability_base:want", - "ability_runtime:app_manager", "appspawn:appspawn_client", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/multi_instance_utils_second_test/BUILD.gn b/test/unittest/multi_instance_utils_second_test/BUILD.gn index f6a45de7f1..963fe877bf 100644 --- a/test/unittest/multi_instance_utils_second_test/BUILD.gn +++ b/test/unittest/multi_instance_utils_second_test/BUILD.gn @@ -25,13 +25,13 @@ ohos_unittest("multi_instance_utils_second_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", ] external_deps = [ "ability_base:want", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/multi_instance_utils_test/BUILD.gn b/test/unittest/multi_instance_utils_test/BUILD.gn index 85f9bd6faf..d9e2bbb30f 100644 --- a/test/unittest/multi_instance_utils_test/BUILD.gn +++ b/test/unittest/multi_instance_utils_test/BUILD.gn @@ -25,13 +25,13 @@ ohos_unittest("multi_instance_utils_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", ] external_deps = [ "ability_base:want", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/os_account_manager_wrapper_test/BUILD.gn b/test/unittest/os_account_manager_wrapper_test/BUILD.gn index d6ffdde0b7..485459b774 100644 --- a/test/unittest/os_account_manager_wrapper_test/BUILD.gn +++ b/test/unittest/os_account_manager_wrapper_test/BUILD.gn @@ -32,6 +32,7 @@ ohos_unittest("os_account_manager_wrapper_test") { deps = [ "${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_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", @@ -39,15 +40,13 @@ ohos_unittest("os_account_manager_wrapper_test") { external_deps = [ "ability_base:want", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", - "c_utils:utils", "cJSON:cjson_static", + "c_utils:utils", "ipc:ipc_core", "napi:ace_napi", "os_account:os_account_innerkits", diff --git a/test/unittest/pending_want_common_event_test/BUILD.gn b/test/unittest/pending_want_common_event_test/BUILD.gn index 06235fbd19..0c28ef702c 100644 --- a/test/unittest/pending_want_common_event_test/BUILD.gn +++ b/test/unittest/pending_want_common_event_test/BUILD.gn @@ -44,7 +44,6 @@ ohos_unittest("pending_want_common_event_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/pending_want_key_test/BUILD.gn b/test/unittest/pending_want_key_test/BUILD.gn index 67e1919785..9cb5953f49 100644 --- a/test/unittest/pending_want_key_test/BUILD.gn +++ b/test/unittest/pending_want_key_test/BUILD.gn @@ -29,6 +29,7 @@ ohos_unittest("pending_want_key_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", @@ -41,7 +42,6 @@ ohos_unittest("pending_want_key_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/pending_want_manager_test/BUILD.gn b/test/unittest/pending_want_manager_test/BUILD.gn index 2d04b9d3bd..539c37b000 100644 --- a/test/unittest/pending_want_manager_test/BUILD.gn +++ b/test/unittest/pending_want_manager_test/BUILD.gn @@ -46,6 +46,8 @@ ohos_unittest("pending_want_manager_test") { } deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", @@ -58,8 +60,6 @@ ohos_unittest("pending_want_manager_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/pending_want_record_test/BUILD.gn b/test/unittest/pending_want_record_test/BUILD.gn index a188c1282b..e4adc78ec5 100644 --- a/test/unittest/pending_want_record_test/BUILD.gn +++ b/test/unittest/pending_want_record_test/BUILD.gn @@ -41,6 +41,8 @@ ohos_unittest("pending_want_record_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } 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_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", @@ -53,8 +55,6 @@ ohos_unittest("pending_want_record_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/pending_want_test/BUILD.gn b/test/unittest/pending_want_test/BUILD.gn index b9a780e467..1f22d01baa 100644 --- a/test/unittest/pending_want_test/BUILD.gn +++ b/test/unittest/pending_want_test/BUILD.gn @@ -38,6 +38,10 @@ ohos_unittest("pending_want_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/error_utils:ability_runtime_error_util", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", + "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", @@ -47,10 +51,6 @@ ohos_unittest("pending_want_test") { "ability_base:base", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", - "ability_runtime:ability_runtime_error_util", - "ability_runtime:abilitykit_native", - "ability_runtime:wantagent_innerkits", "access_token:libnativetoken", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", diff --git a/test/unittest/prepare_terminate_callback_proxy_test/BUILD.gn b/test/unittest/prepare_terminate_callback_proxy_test/BUILD.gn index b611648449..0c06fa6c02 100644 --- a/test/unittest/prepare_terminate_callback_proxy_test/BUILD.gn +++ b/test/unittest/prepare_terminate_callback_proxy_test/BUILD.gn @@ -41,6 +41,8 @@ ohos_unittest("prepare_terminate_callback_proxy_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } 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_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", @@ -53,8 +55,6 @@ ohos_unittest("prepare_terminate_callback_proxy_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/query_erms_manager_test/BUILD.gn b/test/unittest/query_erms_manager_test/BUILD.gn index 0ff3e718c7..4f4b1d19f2 100644 --- a/test/unittest/query_erms_manager_test/BUILD.gn +++ b/test/unittest/query_erms_manager_test/BUILD.gn @@ -50,7 +50,6 @@ ohos_unittest("query_erms_manager_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/query_erms_observer_manager_test/BUILD.gn b/test/unittest/query_erms_observer_manager_test/BUILD.gn index 33a0ba7b96..dba37aa8b5 100644 --- a/test/unittest/query_erms_observer_manager_test/BUILD.gn +++ b/test/unittest/query_erms_observer_manager_test/BUILD.gn @@ -46,7 +46,6 @@ ohos_unittest("query_erms_observer_manager_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/quick_fix/quick_fix_callback_proxy_test/BUILD.gn b/test/unittest/quick_fix/quick_fix_callback_proxy_test/BUILD.gn index 758cb06e83..75818cf24f 100644 --- a/test/unittest/quick_fix/quick_fix_callback_proxy_test/BUILD.gn +++ b/test/unittest/quick_fix/quick_fix_callback_proxy_test/BUILD.gn @@ -31,11 +31,12 @@ ohos_unittest("quick_fix_callback_proxy_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [] + deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/quick_fix/quick_fix_callback_stub_test/BUILD.gn b/test/unittest/quick_fix/quick_fix_callback_stub_test/BUILD.gn index f58f4b35da..30ad78f86b 100644 --- a/test/unittest/quick_fix/quick_fix_callback_stub_test/BUILD.gn +++ b/test/unittest/quick_fix/quick_fix_callback_stub_test/BUILD.gn @@ -31,11 +31,12 @@ ohos_unittest("quick_fix_callback_stub_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [] + deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:want", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/quick_fix/quick_fix_callback_with_record_test/BUILD.gn b/test/unittest/quick_fix/quick_fix_callback_with_record_test/BUILD.gn index d408090074..44301a70b5 100644 --- a/test/unittest/quick_fix/quick_fix_callback_with_record_test/BUILD.gn +++ b/test/unittest/quick_fix/quick_fix_callback_with_record_test/BUILD.gn @@ -30,11 +30,13 @@ ohos_unittest("quick_fix_callback_with_record_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "${ability_runtime_services_path}/appmgr:libappms" ] + deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_services_path}/appmgr:libappms", + ] external_deps = [ "ability_base:want", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/quick_fix/quick_fix_error_utils_test/BUILD.gn b/test/unittest/quick_fix/quick_fix_error_utils_test/BUILD.gn index 1852b9d643..f93ed5710c 100644 --- a/test/unittest/quick_fix/quick_fix_error_utils_test/BUILD.gn +++ b/test/unittest/quick_fix/quick_fix_error_utils_test/BUILD.gn @@ -28,10 +28,11 @@ ohos_unittest("quick_fix_error_utils_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [] + deps = [ + "${ability_runtime_innerkits_path}/quick_fix:quickfix_manager", + ] external_deps = [ - "ability_runtime:quickfix_manager", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", diff --git a/test/unittest/quick_fix/quick_fix_manager_client_test/BUILD.gn b/test/unittest/quick_fix/quick_fix_manager_client_test/BUILD.gn index 1a9f41409d..b13523a6a4 100644 --- a/test/unittest/quick_fix/quick_fix_manager_client_test/BUILD.gn +++ b/test/unittest/quick_fix/quick_fix_manager_client_test/BUILD.gn @@ -37,12 +37,13 @@ ohos_unittest("quick_fix_manager_client_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager" ] + deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/quick_fix:quickfix_manager", + ] external_deps = [ "ability_base:want", - "ability_runtime:app_manager", - "ability_runtime:quickfix_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/quick_fix/quick_fix_manager_service_ability_test/BUILD.gn b/test/unittest/quick_fix/quick_fix_manager_service_ability_test/BUILD.gn index 3634e4c57f..609978eb43 100644 --- a/test/unittest/quick_fix/quick_fix_manager_service_ability_test/BUILD.gn +++ b/test/unittest/quick_fix/quick_fix_manager_service_ability_test/BUILD.gn @@ -28,13 +28,14 @@ ohos_unittest("quick_fix_manager_service_ability_test") { "quick_fix_manager_service_ability_test.cpp", ] - deps = [] + deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/quick_fix:quickfix_manager", + ] configs = [ "${ability_runtime_services_path}/common:common_config" ] external_deps = [ - "ability_runtime:app_manager", - "ability_runtime:quickfix_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/quick_fix/quick_fix_manager_service_second_test/BUILD.gn b/test/unittest/quick_fix/quick_fix_manager_service_second_test/BUILD.gn index fae57fb64e..dca90bc201 100644 --- a/test/unittest/quick_fix/quick_fix_manager_service_second_test/BUILD.gn +++ b/test/unittest/quick_fix/quick_fix_manager_service_second_test/BUILD.gn @@ -44,15 +44,15 @@ ohos_unittest("quick_fix_manager_service_second_test") { } deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/quick_fix:quickfix_manager", + "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/quickfixmgr:quickfixms_static", ] external_deps = [ "ability_base:want", - "ability_runtime:abilitykit_native", - "ability_runtime:app_manager", - "ability_runtime:quickfix_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/quick_fix/quick_fix_manager_service_test/BUILD.gn b/test/unittest/quick_fix/quick_fix_manager_service_test/BUILD.gn index e35e6e9b2e..f23381ada2 100644 --- a/test/unittest/quick_fix/quick_fix_manager_service_test/BUILD.gn +++ b/test/unittest/quick_fix/quick_fix_manager_service_test/BUILD.gn @@ -41,15 +41,15 @@ ohos_unittest("quick_fix_manager_service_test") { } deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/quick_fix:quickfix_manager", + "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/quickfixmgr:quickfixms_static", ] external_deps = [ "ability_base:want", - "ability_runtime:abilitykit_native", - "ability_runtime:app_manager", - "ability_runtime:quickfix_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -91,15 +91,15 @@ ohos_unittest("quick_fix_manager_apply_task_test") { } deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/quick_fix:quickfix_manager", + "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/quickfixmgr:quickfixms_static", ] external_deps = [ "ability_base:want", - "ability_runtime:abilitykit_native", - "ability_runtime:app_manager", - "ability_runtime:quickfix_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/report_data_partition_usage_manager_test/BUILD.gn b/test/unittest/report_data_partition_usage_manager_test/BUILD.gn index 444a073fd2..fd71d7fd2e 100644 --- a/test/unittest/report_data_partition_usage_manager_test/BUILD.gn +++ b/test/unittest/report_data_partition_usage_manager_test/BUILD.gn @@ -46,7 +46,6 @@ ohos_unittest("report_data_partition_usage_manager_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/res_sched_util_test/BUILD.gn b/test/unittest/res_sched_util_test/BUILD.gn index 49d0f56e58..a3fc4585e1 100644 --- a/test/unittest/res_sched_util_test/BUILD.gn +++ b/test/unittest/res_sched_util_test/BUILD.gn @@ -27,10 +27,12 @@ ohos_unittest("res_sched_util_test") { sources = [ "res_sched_util_test.cpp" ] - deps = [ "${ability_runtime_services_path}/common:app_util" ] + deps = [ + "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_services_path}/common:app_util", + ] external_deps = [ - "ability_runtime:abilitykit_native", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/runtime_test/BUILD.gn b/test/unittest/runtime_test/BUILD.gn index 2360efb7a1..e68fd3fa34 100644 --- a/test/unittest/runtime_test/BUILD.gn +++ b/test/unittest/runtime_test/BUILD.gn @@ -32,10 +32,11 @@ ohos_unittest("quickfix_callback_test") { sources = [ "js_quickfix_callback_test.cpp" ] configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] - deps = [] + deps = [ + "${ability_runtime_innerkits_path}/runtime:runtime", + ] external_deps = [ - "ability_runtime:runtime", "c_utils:utils", ] } @@ -54,11 +55,12 @@ ohos_unittest("runtime_test") { ] configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] - deps = [] + deps = [ + "${ability_runtime_innerkits_path}/runtime:runtime", + ] external_deps = [ "ability_base:extractortool", - "ability_runtime:runtime", "c_utils:utils", "zlib:libz", "zlib:shared_libz", @@ -79,11 +81,12 @@ ohos_unittest("hybrid_js_module_reader_test") { ] configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] - deps = [] + deps = [ + "${ability_runtime_innerkits_path}/runtime:runtime", + ] external_deps = [ "ability_base:extractortool", - "ability_runtime:runtime", "c_utils:utils", "zlib:libz", "zlib:shared_libz", @@ -112,11 +115,13 @@ ohos_unittest("js_runtime_test") { ] configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + deps = [ + "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment", + "${ability_runtime_innerkits_path}/runtime:runtime", + ] external_deps = [ "ability_base:extractortool", - "ability_runtime:js_environment", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -155,10 +160,12 @@ ohos_unittest("js_runtime_first_test") { ] configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + deps = [ + "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment", + "${ability_runtime_innerkits_path}/runtime:runtime", + ] external_deps = [ - "ability_runtime:js_environment", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -217,9 +224,12 @@ ohos_unittest("ohos_js_environment_test") { "-Dprotected = public", ] + deps = [ + "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment", + "${ability_runtime_innerkits_path}/runtime:runtime", + ] + external_deps = [ - "ability_runtime:js_environment", - "ability_runtime:runtime", "c_utils:utils", "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", @@ -244,12 +254,13 @@ ohos_unittest("js_worker_test") { ] configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] - deps = [] + deps = [ + "${ability_runtime_innerkits_path}/runtime:runtime", + "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment", + ] external_deps = [ "ability_base:extractortool", - "ability_runtime:js_environment", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -292,11 +303,11 @@ ohos_unittest("ets_runtime_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] deps = [ "${ability_runtime_innerkits_path}/connect_server_manager:connect_server_manager", + "${ability_runtime_innerkits_path}/runtime:runtime", ] external_deps = [ "ability_base:string_utils", - "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", @@ -310,8 +321,8 @@ ohos_unittest("ets_runtime_test") { "json:nlohmann_json_static", "napi:ace_napi", "runtime_core:ani", - "runtime_core:libarkruntime", "runtime_core:common_interfaces_header", + "runtime_core:libarkruntime", ] if (ability_runtime_graphics) { diff --git a/test/unittest/sa_interceptor_manager_test/BUILD.gn b/test/unittest/sa_interceptor_manager_test/BUILD.gn index 9d1c84ef61..2e5005bdaa 100644 --- a/test/unittest/sa_interceptor_manager_test/BUILD.gn +++ b/test/unittest/sa_interceptor_manager_test/BUILD.gn @@ -49,7 +49,6 @@ ohos_unittest("sa_interceptor_manager_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/screen_unlock_interceptor_test/BUILD.gn b/test/unittest/screen_unlock_interceptor_test/BUILD.gn index 62fac16e89..cedc090ba0 100644 --- a/test/unittest/screen_unlock_interceptor_test/BUILD.gn +++ b/test/unittest/screen_unlock_interceptor_test/BUILD.gn @@ -49,6 +49,7 @@ ohos_unittest("screen_unlock_interceptor_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${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}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -61,7 +62,6 @@ ohos_unittest("screen_unlock_interceptor_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "c_utils:utils", "common_event_service:cesfwk_innerkits", "config_policy:configpolicy_util", diff --git a/test/unittest/service_extension_context_test/BUILD.gn b/test/unittest/service_extension_context_test/BUILD.gn index b91593dd8e..1c511bc5e1 100644 --- a/test/unittest/service_extension_context_test/BUILD.gn +++ b/test/unittest/service_extension_context_test/BUILD.gn @@ -40,11 +40,14 @@ ohos_unittest("service_extension_context_test") { } 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_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}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_path}/services/abilitymgr:abilityms_target", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -57,9 +60,6 @@ ohos_unittest("service_extension_context_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_context_native", - "ability_runtime:ability_manager", - "ability_runtime:runtime", "c_utils:utils", "common_event_service:cesfwk_innerkits", "ffrt:libffrt", diff --git a/test/unittest/services/ability_util_test/BUILD.gn b/test/unittest/services/ability_util_test/BUILD.gn index 606c4a3bd6..12f48ec4f5 100644 --- a/test/unittest/services/ability_util_test/BUILD.gn +++ b/test/unittest/services/ability_util_test/BUILD.gn @@ -30,10 +30,13 @@ ohos_unittest("ability_util_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + ] + external_deps = [ "ability_base:base", "ability_base:want", - "ability_runtime:ability_manager", "bundle_framework:appexecfwk_base", "common_event_service:cesfwk_innerkits", "googletest:gmock_main", diff --git a/test/unittest/start_ability_utils_test/BUILD.gn b/test/unittest/start_ability_utils_test/BUILD.gn index f8925be4a1..20c1d03756 100644 --- a/test/unittest/start_ability_utils_test/BUILD.gn +++ b/test/unittest/start_ability_utils_test/BUILD.gn @@ -52,6 +52,7 @@ ohos_unittest("start_ability_utils_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -64,7 +65,6 @@ ohos_unittest("start_ability_utils_test") { "ability_base:configuration", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/start_other_app_interceptor_test/BUILD.gn b/test/unittest/start_other_app_interceptor_test/BUILD.gn index 2968eded6a..c0b65f0147 100644 --- a/test/unittest/start_other_app_interceptor_test/BUILD.gn +++ b/test/unittest/start_other_app_interceptor_test/BUILD.gn @@ -38,6 +38,7 @@ ohos_unittest("start_other_app_interceptor_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/appmgr:libappms", "${ability_runtime_services_path}/common:perm_verification", @@ -46,7 +47,6 @@ ohos_unittest("start_other_app_interceptor_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", diff --git a/test/unittest/state_utils_test/BUILD.gn b/test/unittest/state_utils_test/BUILD.gn index a49284ea5f..d22e5a3625 100644 --- a/test/unittest/state_utils_test/BUILD.gn +++ b/test/unittest/state_utils_test/BUILD.gn @@ -31,11 +31,12 @@ ohos_unittest("state_utils_test") { ] include_dirs = [] - deps = [] + deps = [ + "${ability_runtime_native_path}/ability/native:abilitykit_native", + ] external_deps = [ "ability_base:configuration", - "ability_runtime:abilitykit_native", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/stop_user_callback_proxy_test/BUILD.gn b/test/unittest/stop_user_callback_proxy_test/BUILD.gn index bb2e7a4a56..1453a09457 100755 --- a/test/unittest/stop_user_callback_proxy_test/BUILD.gn +++ b/test/unittest/stop_user_callback_proxy_test/BUILD.gn @@ -35,6 +35,7 @@ ohos_unittest("stop_user_callback_proxy_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:perm_verification", @@ -46,7 +47,6 @@ ohos_unittest("stop_user_callback_proxy_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "c_utils:utils", "common_event_service:cesfwk_innerkits", "ffrt:libffrt", diff --git a/test/unittest/sys_mgr_client_test/BUILD.gn b/test/unittest/sys_mgr_client_test/BUILD.gn index 1817a1dfd6..fd66e50ad8 100644 --- a/test/unittest/sys_mgr_client_test/BUILD.gn +++ b/test/unittest/sys_mgr_client_test/BUILD.gn @@ -37,6 +37,8 @@ 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_services_path}/abilitymgr:abilityms", ] @@ -44,8 +46,6 @@ ohos_unittest("sys_mgr_client_test") { external_deps = [ "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:runtime", "c_utils:utils", "googletest:gmock_main", "googletest:gtest_main", diff --git a/test/unittest/task_data_persistence_mgr_test/BUILD.gn b/test/unittest/task_data_persistence_mgr_test/BUILD.gn index f136607c27..13676d5655 100755 --- a/test/unittest/task_data_persistence_mgr_test/BUILD.gn +++ b/test/unittest/task_data_persistence_mgr_test/BUILD.gn @@ -35,6 +35,7 @@ ohos_unittest("task_data_persistence_mgr_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:mission_info", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -48,7 +49,6 @@ ohos_unittest("task_data_persistence_mgr_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "c_utils:utils", "common_event_service:cesfwk_innerkits", "ffrt:libffrt", diff --git a/test/unittest/timeout_state_utils_test/BUILD.gn b/test/unittest/timeout_state_utils_test/BUILD.gn index f5400d75af..c3fae8e757 100644 --- a/test/unittest/timeout_state_utils_test/BUILD.gn +++ b/test/unittest/timeout_state_utils_test/BUILD.gn @@ -34,24 +34,25 @@ ohos_unittest("timeout_state_utils_test") { "${ability_runtime_path}/utils/global/freeze/include" ] - deps = [] + deps = [ + "${ability_runtime_native_path}/ability/native:abilitykit_native", + ] external_deps = [ "ability_base:configuration", - "ability_runtime:abilitykit_native", + "background_task_mgr:bgtaskmgr_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", "eventhandler:libeventhandler", + "ffrt:libffrt", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", + "hisysevent:libhisysevent", "init:libbegetutil", "ipc:ipc_core", - "hisysevent:libhisysevent", - "background_task_mgr:bgtaskmgr_innerkits", "safwk:system_ability_fwk", - "ffrt:libffrt" ] } diff --git a/test/unittest/trigger_Info_test/BUILD.gn b/test/unittest/trigger_Info_test/BUILD.gn index dabc01db9f..67fbb09a79 100644 --- a/test/unittest/trigger_Info_test/BUILD.gn +++ b/test/unittest/trigger_Info_test/BUILD.gn @@ -27,19 +27,20 @@ ohos_unittest("trigger_Info_test") { if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "${ability_runtime_services_path}/abilitymgr:abilityms" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", + "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_services_path}/abilitymgr:abilityms", + ] external_deps = [ "ability_base:base", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", - "ability_runtime:abilitykit_native", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", - "c_utils:utils", "common_event_service:cesfwk_core", "eventhandler:libeventhandler", "googletest:gmock_main", diff --git a/test/unittest/udmf_utils_test/BUILD.gn b/test/unittest/udmf_utils_test/BUILD.gn index 21525d837e..b6f15032ee 100644 --- a/test/unittest/udmf_utils_test/BUILD.gn +++ b/test/unittest/udmf_utils_test/BUILD.gn @@ -35,11 +35,12 @@ ohos_unittest("udmf_utils_test") { "udmf_utils_test.cpp", ] - deps = [] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + ] external_deps = [ "ability_base:want", - "ability_runtime:ability_manager", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", diff --git a/test/unittest/ui_extension/extension_record_manager_test/BUILD.gn b/test/unittest/ui_extension/extension_record_manager_test/BUILD.gn index ff172ab2b6..33ac124290 100755 --- a/test/unittest/ui_extension/extension_record_manager_test/BUILD.gn +++ b/test/unittest/ui_extension/extension_record_manager_test/BUILD.gn @@ -66,6 +66,7 @@ ohos_unittest("extension_record_manager_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/global/common:runtime_utils", "${ability_runtime_path}/utils/server/startup:startup_util", @@ -76,8 +77,6 @@ ohos_unittest("extension_record_manager_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/ui_extension/ui_extension_get_host_info_test/BUILD.gn b/test/unittest/ui_extension/ui_extension_get_host_info_test/BUILD.gn index 48b493a841..29f207be20 100644 --- a/test/unittest/ui_extension/ui_extension_get_host_info_test/BUILD.gn +++ b/test/unittest/ui_extension/ui_extension_get_host_info_test/BUILD.gn @@ -38,13 +38,15 @@ ohos_unittest("ui_extension_get_host_info_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "${ability_runtime_native_path}/appkit:appkit_manager_helper" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", + "${ability_runtime_native_path}/appkit:appkit_manager_helper", + ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/ui_extension/ui_extension_session_info_test/BUILD.gn b/test/unittest/ui_extension/ui_extension_session_info_test/BUILD.gn index de3c992737..556cfda3bc 100755 --- a/test/unittest/ui_extension/ui_extension_session_info_test/BUILD.gn +++ b/test/unittest/ui_extension/ui_extension_session_info_test/BUILD.gn @@ -49,6 +49,7 @@ ohos_unittest("ui_extension_session_info_test") { deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/ability_manager:ability_start_options", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -58,8 +59,6 @@ ohos_unittest("ui_extension_session_info_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", 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 df630effbc..118bf5e968 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,13 +28,15 @@ ohos_unittest("ui_extension_connect_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + ] external_deps = [ "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/ui_extension_ability_test/ui_extension_preload_test/BUILD.gn b/test/unittest/ui_extension_ability_test/ui_extension_preload_test/BUILD.gn index 58c8da5864..f9e63e185b 100644 --- a/test/unittest/ui_extension_ability_test/ui_extension_preload_test/BUILD.gn +++ b/test/unittest/ui_extension_ability_test/ui_extension_preload_test/BUILD.gn @@ -29,14 +29,14 @@ ohos_unittest("ui_extension_preload_test") { } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", ] external_deps = [ "ability_base:session_info", "ability_base:want", - "ability_runtime:ability_manager", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/ui_extension_record_factory_test/BUILD.gn b/test/unittest/ui_extension_record_factory_test/BUILD.gn index 4c218ea291..3ce59f5664 100644 --- a/test/unittest/ui_extension_record_factory_test/BUILD.gn +++ b/test/unittest/ui_extension_record_factory_test/BUILD.gn @@ -55,17 +55,18 @@ ohos_unittest("ui_extension_record_factory_test") { } deps = [ - "${ability_runtime_path}/utils/server/startup:startup_util", "${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", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${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:auto_startup_callback", "${ability_runtime_native_path}/ability/native:ui_extension", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", "${ability_runtime_services_path}/common:app_util", @@ -86,7 +87,6 @@ ohos_unittest("ui_extension_record_factory_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/unittest/ui_extension_record_test/BUILD.gn b/test/unittest/ui_extension_record_test/BUILD.gn index 9ccdd08297..b59947663a 100644 --- a/test/unittest/ui_extension_record_test/BUILD.gn +++ b/test/unittest/ui_extension_record_test/BUILD.gn @@ -35,13 +35,13 @@ ohos_unittest("ui_extension_record_test") { deps = [ "${ability_runtime_abilitymgr_path}/:abilityms", - "${ability_runtime_innerkits_path}/app_manager:app_manager" + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", ] external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/ui_service_extension_test/BUILD.gn b/test/unittest/ui_service_extension_test/BUILD.gn index b13a318a9f..a4fa9cba5a 100644 --- a/test/unittest/ui_service_extension_test/BUILD.gn +++ b/test/unittest/ui_service_extension_test/BUILD.gn @@ -40,11 +40,12 @@ ohos_unittest("ui_service_extension_test") { "${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_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:ui_service_extension", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_path}/services/abilitymgr:abilityms_target", @@ -54,7 +55,6 @@ ohos_unittest("ui_service_extension_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "ace_engine:ace_uicontent", "c_utils:utils", "eventhandler:libeventhandler", diff --git a/test/unittest/ui_service_host_proxy_test/BUILD.gn b/test/unittest/ui_service_host_proxy_test/BUILD.gn index 435d32561f..cd645b7f3c 100644 --- a/test/unittest/ui_service_host_proxy_test/BUILD.gn +++ b/test/unittest/ui_service_host_proxy_test/BUILD.gn @@ -43,8 +43,8 @@ ohos_unittest("ui_service_host_proxy_test") { "${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}/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:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", @@ -52,16 +52,16 @@ ohos_unittest("ui_service_host_proxy_test") { "${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}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment", "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:js_environment", - "ability_runtime:runtime", "ace_engine:ace_uicontent", "c_utils:utils", "eventhandler:libeventhandler", diff --git a/test/unittest/ui_service_host_stub_test/BUILD.gn b/test/unittest/ui_service_host_stub_test/BUILD.gn index 97dd46163c..809f635e2e 100644 --- a/test/unittest/ui_service_host_stub_test/BUILD.gn +++ b/test/unittest/ui_service_host_stub_test/BUILD.gn @@ -47,10 +47,11 @@ ohos_unittest("ui_service_host_stub_test") { deps = [ "${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_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:ui_service_extension", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -59,7 +60,6 @@ ohos_unittest("ui_service_host_stub_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "ace_engine:ace_uicontent", "c_utils:utils", "googletest:gmock_main", diff --git a/test/unittest/ui_service_proxy_test/BUILD.gn b/test/unittest/ui_service_proxy_test/BUILD.gn index 404d0bc5f6..e42dffa6fa 100644 --- a/test/unittest/ui_service_proxy_test/BUILD.gn +++ b/test/unittest/ui_service_proxy_test/BUILD.gn @@ -43,8 +43,8 @@ ohos_unittest("ui_service_proxy_test") { "${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}/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:ability_business_error", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:abilitykit_utils", @@ -52,16 +52,16 @@ ohos_unittest("ui_service_proxy_test") { "${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}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment", "${ability_runtime_path}/services/abilitymgr:abilityms_target", ] external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:js_environment", - "ability_runtime:runtime", "ace_engine:ace_uicontent", "c_utils:utils", "eventhandler:libeventhandler", diff --git a/test/unittest/ui_service_stub_test/BUILD.gn b/test/unittest/ui_service_stub_test/BUILD.gn index 093ee26271..80761f21f6 100644 --- a/test/unittest/ui_service_stub_test/BUILD.gn +++ b/test/unittest/ui_service_stub_test/BUILD.gn @@ -49,10 +49,11 @@ ohos_unittest("ui_service_stub_test") { deps = [ "${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_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:ui_service_extension", + "${ability_runtime_native_path}/ability:ability_context_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", @@ -61,7 +62,6 @@ ohos_unittest("ui_service_stub_test") { external_deps = [ "ability_base:configuration", "ability_base:want", - "ability_runtime:runtime", "ace_engine:ace_uicontent", "c_utils:utils", "googletest:gmock_main", diff --git a/test/unittest/update_caller_info_util_test/BUILD.gn b/test/unittest/update_caller_info_util_test/BUILD.gn index 044e695e8a..975027a788 100644 --- a/test/unittest/update_caller_info_util_test/BUILD.gn +++ b/test/unittest/update_caller_info_util_test/BUILD.gn @@ -42,6 +42,7 @@ ohos_unittest("update_caller_info_util_test") { configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", @@ -52,7 +53,6 @@ ohos_unittest("update_caller_info_util_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/unittest/want_agent_helper_test/BUILD.gn b/test/unittest/want_agent_helper_test/BUILD.gn index a4bc70af8d..5732c955b3 100644 --- a/test/unittest/want_agent_helper_test/BUILD.gn +++ b/test/unittest/want_agent_helper_test/BUILD.gn @@ -38,6 +38,10 @@ ohos_unittest("want_agent_helper_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/error_utils:ability_runtime_error_util", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", + "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_services_path}/abilitymgr:abilityms", ] @@ -46,10 +50,6 @@ ohos_unittest("want_agent_helper_test") { "ability_base:base", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", - "ability_runtime:ability_runtime_error_util", - "ability_runtime:abilitykit_native", - "ability_runtime:wantagent_innerkits", "access_token:libnativetoken", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", diff --git a/test/unittest/want_agent_info_test/BUILD.gn b/test/unittest/want_agent_info_test/BUILD.gn index 0171ea9411..5c8dcc41f7 100644 --- a/test/unittest/want_agent_info_test/BUILD.gn +++ b/test/unittest/want_agent_info_test/BUILD.gn @@ -27,15 +27,17 @@ ohos_unittest("want_agent_info_test") { if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "${ability_runtime_services_path}/abilitymgr:abilityms" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", + "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_services_path}/abilitymgr:abilityms", + ] external_deps = [ "ability_base:base", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", - "ability_runtime:abilitykit_native", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/want_agent_test/BUILD.gn b/test/unittest/want_agent_test/BUILD.gn index a1cdb7dcde..ed7e88763e 100644 --- a/test/unittest/want_agent_test/BUILD.gn +++ b/test/unittest/want_agent_test/BUILD.gn @@ -31,15 +31,17 @@ ohos_unittest("want_agent_test") { if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "${ability_runtime_services_path}/abilitymgr:abilityms" ] + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits", + "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_services_path}/abilitymgr:abilityms", + ] external_deps = [ "ability_base:base", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", - "ability_runtime:abilitykit_native", - "ability_runtime:wantagent_innerkits", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/test/unittest/want_sender_info_test/BUILD.gn b/test/unittest/want_sender_info_test/BUILD.gn index dad9d5e68c..407ba0a5d8 100644 --- a/test/unittest/want_sender_info_test/BUILD.gn +++ b/test/unittest/want_sender_info_test/BUILD.gn @@ -35,6 +35,7 @@ ohos_unittest("want_sender_info_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", @@ -47,7 +48,6 @@ ohos_unittest("want_sender_info_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/want_utils_test/BUILD.gn b/test/unittest/want_utils_test/BUILD.gn index 8f4deb6162..62c33a7756 100644 --- a/test/unittest/want_utils_test/BUILD.gn +++ b/test/unittest/want_utils_test/BUILD.gn @@ -40,6 +40,7 @@ ohos_unittest("want_utils_test") { ] deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/appkit:appkit_manager_helper", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:task_handler_wrap", @@ -48,7 +49,6 @@ ohos_unittest("want_utils_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "app_domain_verify:app_domain_verify_common", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", diff --git a/test/unittest/wants_info_test/BUILD.gn b/test/unittest/wants_info_test/BUILD.gn index 13de658d22..04fbf643b1 100644 --- a/test/unittest/wants_info_test/BUILD.gn +++ b/test/unittest/wants_info_test/BUILD.gn @@ -32,6 +32,7 @@ ohos_unittest("wants_info_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", "${ability_runtime_services_path}/common:perm_verification", @@ -43,7 +44,6 @@ ohos_unittest("wants_info_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_manager", "access_token:libaccesstoken_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", diff --git a/test/unittest/window_focus_changed_listener_test/BUILD.gn b/test/unittest/window_focus_changed_listener_test/BUILD.gn index b576b188cd..5abccbb066 100644 --- a/test/unittest/window_focus_changed_listener_test/BUILD.gn +++ b/test/unittest/window_focus_changed_listener_test/BUILD.gn @@ -58,16 +58,17 @@ ohos_unittest("window_focus_changed_listener_test") { } deps = [ - "${ability_runtime_path}/utils/server/startup:startup_util", "${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", "${ability_runtime_innerkits_path}/ability_manager:mission_info", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:abilitykit_native", "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_native_path}/ability/native:ui_extension", "${ability_runtime_native_path}/appkit:app_context", "${ability_runtime_native_path}/appkit:appkit_native", + "${ability_runtime_path}/utils/server/startup:startup_util", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", "${ability_runtime_services_path}/common:perm_verification", @@ -82,7 +83,6 @@ ohos_unittest("window_focus_changed_listener_test") { "ability_base:session_info", "ability_base:want", "ability_base:zuri", - "ability_runtime:ability_deps_wrapper", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "c_utils:utils", diff --git a/test/unittest/window_options_utils_test/BUILD.gn b/test/unittest/window_options_utils_test/BUILD.gn index 9b4a88208d..5fd5d83a8a 100644 --- a/test/unittest/window_options_utils_test/BUILD.gn +++ b/test/unittest/window_options_utils_test/BUILD.gn @@ -45,12 +45,12 @@ ohos_unittest("window_options_utils_test") { deps = [ "${ability_runtime_abilitymgr_path}/:abilityms", + "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_services_path}/abilitymgr:abilityms", ] external_deps = [ "ability_base:base", - "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils",