From 95a05b12130394b4ada84f912c5be62996834cd7 Mon Sep 17 00:00:00 2001 From: wanghang Date: Mon, 28 Feb 2022 07:23:58 +0000 Subject: [PATCH] a Signed-off-by: wanghang Change-Id: Ibda67081196b65e7cd43311706c1cfcc0c5fa081 --- .../kits/ability/ability_runtime/test/BUILD.gn | 2 +- frameworks/kits/ability/native/BUILD.gn | 2 +- frameworks/kits/ability/native/test/BUILD.gn | 8 ++++---- frameworks/kits/appkit/BUILD.gn | 7 +++---- frameworks/kits/appkit/native/test/BUILD.gn | 4 ++-- frameworks/kits/appkit/test/BUILD.gn | 8 ++++---- frameworks/kits/test/BUILD.gn | 6 +++--- interfaces/innerkits/ability_manager/BUILD.gn | 2 +- .../kits/napi/aafwk/abilityManager/BUILD.gn | 2 +- interfaces/kits/napi/aafwk/app/appMgr/BUILD.gn | 2 +- .../kits/napi/aafwk/app/app_manager/BUILD.gn | 2 +- .../kits/napi/aafwk/mission_manager/BUILD.gn | 2 +- services/abilitymgr/BUILD.gn | 2 +- services/abilitymgr/test/BUILD.gn | 2 +- .../test/mock/appmgr_test_service/BUILD.gn | 2 +- .../abilitymgr/test/mock/libs/aakit/BUILD.gn | 2 +- .../test/mock/libs/appexecfwk_core/BUILD.gn | 4 ++-- services/appmgr/BUILD.gn | 2 +- services/appmgr/examples/BUILD.gn | 2 +- services/appmgr/test/BUILD.gn | 2 +- .../ams_ability_running_record_test/BUILD.gn | 2 +- .../ams_app_death_recipient_test/BUILD.gn | 2 +- .../unittest/ams_app_life_cycle_test/BUILD.gn | 2 +- .../unittest/ams_app_mgr_client_test/BUILD.gn | 2 +- .../ams_app_running_record_test/BUILD.gn | 2 +- .../ams_app_state_callback_test/BUILD.gn | 2 +- .../test/unittest/ams_app_workflow_test/BUILD.gn | 2 +- .../unittest/ams_cgroup_manager_test/BUILD.gn | 6 ++++-- .../unittest/ams_ipc_interface_test/BUILD.gn | 2 +- .../test/unittest/ams_lmks_client_test/BUILD.gn | 2 +- .../unittest/ams_mgr_scheduler_test/BUILD.gn | 2 +- .../unittest/ams_process_optimizer_test/BUILD.gn | 2 +- .../unittest/ams_recent_app_list_test/BUILD.gn | 2 +- .../ams_service_app_spawn_client_test/BUILD.gn | 2 +- .../ams_service_event_drive_test/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../unittest/ams_service_startup_test/BUILD.gn | 2 +- .../app_mgr_service_event_handler_test/BUILD.gn | 2 +- services/dataobsmgr/BUILD.gn | 2 +- .../unittest/fms_form_cache_mgr_test/BUILD.gn | 2 +- .../unittest/fms_form_data_mgr_test/BUILD.gn | 2 +- .../unittest/fms_form_db_record_test/BUILD.gn | 2 +- .../unittest/fms_form_host_record_test/BUILD.gn | 2 +- .../unittest/fms_form_info_mgr_test/BUILD.gn | 2 +- .../unittest/fms_form_mgr_add_form_test/BUILD.gn | 2 +- .../fms_form_mgr_cast_temp_form_test/BUILD.gn | 2 +- .../fms_form_mgr_death_callback_test/BUILD.gn | 2 +- .../fms_form_mgr_delete_form_test/BUILD.gn | 2 +- .../fms_form_mgr_lifecycle_update_test/BUILD.gn | 2 +- .../fms_form_mgr_message_event_test/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../fms_form_mgr_release_form_test/BUILD.gn | 2 +- .../fms_form_mgr_request_form_test/BUILD.gn | 2 +- .../fms_form_mgr_update_form_test/BUILD.gn | 2 +- .../fms_form_provider_data_test/BUILD.gn | 2 +- .../unittest/fms_form_provider_mgr_test/BUILD.gn | 2 +- .../fms_form_set_next_refresh_test/BUILD.gn | 2 +- .../fms_form_sys_event_receiver_test/BUILD.gn | 2 +- .../moduletest/ability_mgr_service_test/BUILD.gn | 2 +- .../test/moduletest/ability_record_test/BUILD.gn | 2 +- .../test/moduletest/ability_stack_test/BUILD.gn | 2 +- services/test/moduletest/common/ams/BUILD.gn | 2 +- .../moduletest/ipc_ability_mgr_test/BUILD.gn | 2 +- .../ipc_ability_scheduler_test/BUILD.gn | 2 +- .../panding_want_manager_test/BUILD.gn | 2 +- .../abilitySrc/amsAbilityAppendTestA/BUILD.gn | 2 +- .../abilitySrc/amsAbilityAppendTestB/BUILD.gn | 2 +- .../amsAbilityVisibleTestPageA/BUILD.gn | 2 +- .../amsAbilityVisibleTestServiceB/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../amsConfigurationUpdatedTest/BUILD.gn | 2 +- .../abilitySrc/amsDataSystemTestA/BUILD.gn | 2 +- .../abilitySrc/amsDataSystemTestB/BUILD.gn | 2 +- .../abilitySrc/amsDataSystemTestC/BUILD.gn | 2 +- .../abilitySrc/amsKitSTAbilityManager/BUILD.gn | 2 +- .../amsKitSTAbilityManagerFirst/BUILD.gn | 2 +- .../abilitySrc/amsKitSystemTest/BUILD.gn | 2 +- .../abilitySrc/amsKitSystemTestA/BUILD.gn | 2 +- .../abilitySrc/amsKitSystemTestB/BUILD.gn | 2 +- .../abilitySrc/amsKitSystemTestDataA/BUILD.gn | 2 +- .../abilitySrc/amsKitSystemTestDataB/BUILD.gn | 2 +- .../abilitySrc/amsKitSystemTestPageA/BUILD.gn | 2 +- .../abilitySrc/amsKitSystemTestService/BUILD.gn | 2 +- .../abilitySrc/amsMissionStackTest/BUILD.gn | 2 +- .../amsMissionStackTestSubsidiary/BUILD.gn | 2 +- .../abilitySrc/amsStDataAbility/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestA/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestB/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestC/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestD/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestDFX/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestE/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestErrorK/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestErrorL/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestF/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestG/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestH/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestI/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestM/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestN/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestO/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestP/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestQ/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestR/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestServiceA/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestServiceB/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestServiceC/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestServiceD/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestServiceE/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestServiceF/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestServiceG/BUILD.gn | 2 +- .../abilitySrc/amsSystemTestServiceH/BUILD.gn | 2 +- .../abilitySrc/fwkAbilityState/BUILD.gn | 2 +- .../abilitySrc/taskDispatcherTestA/BUILD.gn | 2 +- .../abilitySrc/taskDispatcherTestB/BUILD.gn | 2 +- .../fmsSystemPerformance/BUILD.gn | 2 +- .../fmsSystemStress/BUILD.gn | 2 +- .../fmsSystemTestHostNoPerm/BUILD.gn | 2 +- .../fmsSystemTestHostNotSys/BUILD.gn | 2 +- .../selfStartingTestHostA/BUILD.gn | 2 +- .../selfStartingTestHostB/BUILD.gn | 2 +- .../formSystemTestServiceA/BUILD.gn | 2 +- .../formSystemTestServiceB/BUILD.gn | 2 +- .../formSystemTestServiceC/BUILD.gn | 2 +- .../formSystemTestServiceD/BUILD.gn | 2 +- .../formSystemTestServiceE/BUILD.gn | 2 +- .../common/ams/ams_aa_command_test/BUILD.gn | 2 +- .../common/ams/ams_ability_append_test/BUILD.gn | 2 +- .../ams_ability_state_age_manual_test/BUILD.gn | 2 +- .../common/ams/ams_ability_state_test/BUILD.gn | 2 +- .../common/ams/ams_ability_visible_test/BUILD.gn | 2 +- .../ams/ams_app_process_manage_test/BUILD.gn | 2 +- .../common/ams/ams_check_service/BUILD.gn | 2 +- .../ams/ams_configuration_updated_test/BUILD.gn | 2 +- .../common/ams/ams_data_ability_test/BUILD.gn | 2 +- test/systemtest/common/ams/ams_dfx_test/BUILD.gn | 2 +- test/systemtest/common/ams/ams_kit_test/BUILD.gn | 16 ++++++++-------- .../common/ams/ams_missionstack_test/BUILD.gn | 2 +- .../common/ams/ams_page_ability_test/BUILD.gn | 2 +- .../common/ams/ams_power_test/BUILD.gn | 2 +- .../common/ams/ams_service_ability_test/BUILD.gn | 2 +- test/systemtest/common/ams/tool/BUILD.gn | 2 +- test/systemtest/common/task_dispatcher/BUILD.gn | 2 +- tools/aa/BUILD.gn | 2 +- tools/fm/BUILD.gn | 2 +- 146 files changed, 168 insertions(+), 167 deletions(-) diff --git a/frameworks/kits/ability/ability_runtime/test/BUILD.gn b/frameworks/kits/ability/ability_runtime/test/BUILD.gn index 98257f7c4f..cbdb9dc5c4 100644 --- a/frameworks/kits/ability/ability_runtime/test/BUILD.gn +++ b/frameworks/kits/ability/ability_runtime/test/BUILD.gn @@ -53,13 +53,13 @@ ohos_moduletest("ability_caller_fw_module_test") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "multimodalinput_base:libmmi-client", diff --git a/frameworks/kits/ability/native/BUILD.gn b/frameworks/kits/ability/native/BUILD.gn index db347c3f52..99930951f5 100644 --- a/frameworks/kits/ability/native/BUILD.gn +++ b/frameworks/kits/ability/native/BUILD.gn @@ -254,7 +254,6 @@ ohos_shared_library("abilitykit_native") { "//foundation/ace/napi:ace_napi", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common", @@ -269,6 +268,7 @@ ohos_shared_library("abilitykit_native") { "ability_runtime:napi_base_context", "ability_runtime:runtime", "access_token:libaccesstoken_sdk", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "ces_standard:cesfwk_innerkits", "distributeddataobject:distributeddataobject_impl", diff --git a/frameworks/kits/ability/native/test/BUILD.gn b/frameworks/kits/ability/native/test/BUILD.gn index 823ab18cb5..cf8f29aa8f 100644 --- a/frameworks/kits/ability/native/test/BUILD.gn +++ b/frameworks/kits/ability/native/test/BUILD.gn @@ -23,7 +23,6 @@ config("module_private_config") { include_dirs = [ "//base/global/i18n_standard/frameworks/intl/include", "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk_L2/content", "//EOSP/communication/libsoftbus/../../../foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk_L2/content", @@ -527,7 +526,6 @@ ohos_unittest("ability_impl_test") { "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -538,6 +536,7 @@ ohos_unittest("ability_impl_test") { external_deps = [ "ability_runtime:runtime", + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "multimodalinput_base:libmmi-client", @@ -623,7 +622,6 @@ ohos_unittest("form_provider_client_test") { "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/standard:libwmclient", @@ -632,6 +630,7 @@ ohos_unittest("form_provider_client_test") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", @@ -927,6 +926,7 @@ ohos_unittest("ability_permission_test") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "multimodalinput_base:libmmi-client", @@ -1026,7 +1026,6 @@ ohos_unittest("form_host_client_test") { "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/standard:libwmclient", @@ -1037,6 +1036,7 @@ ohos_unittest("form_host_client_test") { external_deps = [ "ability_runtime:runtime", + "bundle_framework:appexecfwk_core", "form_runtime:fmskit_native", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", diff --git a/frameworks/kits/appkit/BUILD.gn b/frameworks/kits/appkit/BUILD.gn index 43cb6d0433..86a5d5e9d2 100644 --- a/frameworks/kits/appkit/BUILD.gn +++ b/frameworks/kits/appkit/BUILD.gn @@ -148,7 +148,6 @@ ohos_shared_library("appkit_native") { "${aafwk_path}/interfaces/innerkits/want:want", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "${innerkits_path}/uri_permission:uri_permission_mgr", "//base/hiviewdfx/faultloggerd/interfaces/innerkits/dump_catcher:lib_dfx_dump_catcher", @@ -167,6 +166,7 @@ ohos_shared_library("appkit_native") { external_deps = [ "ability_base:configuration", "ability_runtime:runtime", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", @@ -186,7 +186,6 @@ ohos_shared_library("app_context") { "//base/account/os_account/interfaces/innerkits/osaccount/native/include", "${aafwk_path}/frameworks/kits/appkit/native/app/include", "${aafwk_path}/frameworks/kits/appkit/native/ability_runtime/context", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//utils/system/safwk/native/include", @@ -210,7 +209,6 @@ ohos_shared_library("app_context") { deps = [ "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", # "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/common/task_dispatcher:task_dispatcher", @@ -232,6 +230,7 @@ ohos_shared_library("app_context") { external_deps = [ "ability_runtime:runtime", + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "napi:ace_napi", @@ -283,7 +282,6 @@ ohos_shared_library("appkit_delegator") { "${aafwk_path}/interfaces/innerkits/want:want", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/icu/icu4c:shared_icuuc", "//utils/native/base:utils", @@ -291,6 +289,7 @@ ohos_shared_library("appkit_delegator") { external_deps = [ "ability_runtime:runtime", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/frameworks/kits/appkit/native/test/BUILD.gn b/frameworks/kits/appkit/native/test/BUILD.gn index abd4db2151..2443f68c51 100755 --- a/frameworks/kits/appkit/native/test/BUILD.gn +++ b/frameworks/kits/appkit/native/test/BUILD.gn @@ -132,7 +132,6 @@ ohos_unittest("application_test") { "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -143,6 +142,7 @@ ohos_unittest("application_test") { external_deps = [ "ability_runtime:runtime", + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] @@ -294,7 +294,6 @@ ohos_unittest("application_impl_test") { "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -303,6 +302,7 @@ ohos_unittest("application_impl_test") { external_deps = [ "ability_runtime:runtime", + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/frameworks/kits/appkit/test/BUILD.gn b/frameworks/kits/appkit/test/BUILD.gn index 5aa5d62faf..f3b5d583d6 100755 --- a/frameworks/kits/appkit/test/BUILD.gn +++ b/frameworks/kits/appkit/test/BUILD.gn @@ -68,7 +68,6 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_first") { "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", @@ -77,6 +76,7 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_first") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", @@ -109,7 +109,6 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_second") { "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", @@ -118,6 +117,7 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_second") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", @@ -150,7 +150,6 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_third") { "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", @@ -159,6 +158,7 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_third") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", @@ -191,7 +191,6 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_fourth") { "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", @@ -200,6 +199,7 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_fourth") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/frameworks/kits/test/BUILD.gn b/frameworks/kits/test/BUILD.gn index ce4df003a8..f451b62ea7 100644 --- a/frameworks/kits/test/BUILD.gn +++ b/frameworks/kits/test/BUILD.gn @@ -100,7 +100,6 @@ ohos_moduletest("ability_moduletest") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", @@ -111,6 +110,7 @@ ohos_moduletest("ability_moduletest") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "multimodalinput_base:libmmi-client", @@ -162,7 +162,6 @@ ohos_moduletest("ability_conetxt_test") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", @@ -172,6 +171,7 @@ ohos_moduletest("ability_conetxt_test") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "multimodalinput_base:libmmi-client", @@ -234,7 +234,6 @@ ohos_moduletest("data_ability_operation_moduletest") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", @@ -245,6 +244,7 @@ ohos_moduletest("data_ability_operation_moduletest") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "multimodalinput_base:libmmi-client", diff --git a/interfaces/innerkits/ability_manager/BUILD.gn b/interfaces/innerkits/ability_manager/BUILD.gn index 54b64109bf..34c3de137c 100644 --- a/interfaces/innerkits/ability_manager/BUILD.gn +++ b/interfaces/innerkits/ability_manager/BUILD.gn @@ -98,7 +98,6 @@ ohos_shared_library("ability_manager") { "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb:native_rdb", @@ -110,6 +109,7 @@ ohos_shared_library("ability_manager") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/interfaces/kits/napi/aafwk/abilityManager/BUILD.gn b/interfaces/kits/napi/aafwk/abilityManager/BUILD.gn index d53939b18a..432e438019 100644 --- a/interfaces/kits/napi/aafwk/abilityManager/BUILD.gn +++ b/interfaces/kits/napi/aafwk/abilityManager/BUILD.gn @@ -39,7 +39,6 @@ ohos_shared_library("abilitymanager") { "//foundation/ace/napi:ace_napi", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/appexecfwk/standard/libs/libeventhandler:libeventhandler_target", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", @@ -50,6 +49,7 @@ ohos_shared_library("abilitymanager") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/interfaces/kits/napi/aafwk/app/appMgr/BUILD.gn b/interfaces/kits/napi/aafwk/app/appMgr/BUILD.gn index 01f861509d..b5230e0a77 100644 --- a/interfaces/kits/napi/aafwk/app/appMgr/BUILD.gn +++ b/interfaces/kits/napi/aafwk/app/appMgr/BUILD.gn @@ -34,7 +34,6 @@ ohos_shared_library("napi_app_mgr") { "//foundation/ace/napi:ace_napi", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/libs/libeventhandler:libeventhandler_target", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -43,6 +42,7 @@ ohos_shared_library("napi_app_mgr") { external_deps = [ "ability_runtime:app_manager", + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/interfaces/kits/napi/aafwk/app/app_manager/BUILD.gn b/interfaces/kits/napi/aafwk/app/app_manager/BUILD.gn index f3d19a4702..71fbac6053 100644 --- a/interfaces/kits/napi/aafwk/app/app_manager/BUILD.gn +++ b/interfaces/kits/napi/aafwk/app/app_manager/BUILD.gn @@ -34,7 +34,6 @@ ohos_shared_library("appmanager_napi") { "//foundation/ace/napi:ace_napi", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -46,6 +45,7 @@ ohos_shared_library("appmanager_napi") { "ability_runtime:runtime", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/interfaces/kits/napi/aafwk/mission_manager/BUILD.gn b/interfaces/kits/napi/aafwk/mission_manager/BUILD.gn index 54de57a91d..8b50ade163 100644 --- a/interfaces/kits/napi/aafwk/mission_manager/BUILD.gn +++ b/interfaces/kits/napi/aafwk/mission_manager/BUILD.gn @@ -94,12 +94,12 @@ ohos_shared_library("distributedmissionmanager") { "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common", "//foundation/ace/napi:ace_napi", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//utils/native/base:utils", ] external_deps = [ "ability_runtime:app_manager", + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "ipc_js:rpc", diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index 99e4e269f8..212cda4f75 100644 --- a/services/abilitymgr/BUILD.gn +++ b/services/abilitymgr/BUILD.gn @@ -90,7 +90,6 @@ ohos_shared_library("abilityms") { "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb:native_rdb", @@ -105,6 +104,7 @@ ohos_shared_library("abilityms") { external_deps = [ "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", diff --git a/services/abilitymgr/test/BUILD.gn b/services/abilitymgr/test/BUILD.gn index f434c2e139..471faea2ff 100644 --- a/services/abilitymgr/test/BUILD.gn +++ b/services/abilitymgr/test/BUILD.gn @@ -136,7 +136,6 @@ ohos_source_set("abilityms_test_source") { "//base/hiviewdfx/hiview/adapter/utility:hiview_adapter_utility", "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/graphic/standard:libwmservice", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", @@ -145,6 +144,7 @@ ohos_source_set("abilityms_test_source") { external_deps = [ "access_token:libaccesstoken_sdk", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", diff --git a/services/abilitymgr/test/mock/appmgr_test_service/BUILD.gn b/services/abilitymgr/test/mock/appmgr_test_service/BUILD.gn index 3d751c3e92..8988fdc59c 100644 --- a/services/abilitymgr/test/mock/appmgr_test_service/BUILD.gn +++ b/services/abilitymgr/test/mock/appmgr_test_service/BUILD.gn @@ -47,7 +47,6 @@ ohos_source_set("appmgr_test_service") { "${innerkits_path}/want:want", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", @@ -56,6 +55,7 @@ ohos_source_set("appmgr_test_service") { public_deps = [ "//foundation/graphic/standard:libwmservice" ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/abilitymgr/test/mock/libs/aakit/BUILD.gn b/services/abilitymgr/test/mock/libs/aakit/BUILD.gn index cb0d6c7999..35918d6b8d 100644 --- a/services/abilitymgr/test/mock/libs/aakit/BUILD.gn +++ b/services/abilitymgr/test/mock/libs/aakit/BUILD.gn @@ -45,7 +45,6 @@ ohos_source_set("aakit_mock") { "${innerkits_path}/want:want", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -53,6 +52,7 @@ ohos_source_set("aakit_mock") { "//utils/native/base:utils", ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/abilitymgr/test/mock/libs/appexecfwk_core/BUILD.gn b/services/abilitymgr/test/mock/libs/appexecfwk_core/BUILD.gn index 085aec1576..10fe06b3cd 100644 --- a/services/abilitymgr/test/mock/libs/appexecfwk_core/BUILD.gn +++ b/services/abilitymgr/test/mock/libs/appexecfwk_core/BUILD.gn @@ -29,8 +29,6 @@ config("appexecfwk_core_mock_config") { "//base/notification/ces_standard/interfaces/innerkits/native/include/", "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/aakit/include/", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr/", ] } @@ -53,6 +51,7 @@ ohos_source_set("appexecfwk_appmgr_mock") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] @@ -81,6 +80,7 @@ ohos_source_set("appexecfwk_bundlemgr_mock") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/appmgr/BUILD.gn b/services/appmgr/BUILD.gn index 724f220ced..6eea71403f 100644 --- a/services/appmgr/BUILD.gn +++ b/services/appmgr/BUILD.gn @@ -113,7 +113,6 @@ ohos_shared_library("libams") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/common:perm_verification", @@ -129,6 +128,7 @@ ohos_shared_library("libams") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", diff --git a/services/appmgr/examples/BUILD.gn b/services/appmgr/examples/BUILD.gn index 8c977918bf..4fe7923afe 100644 --- a/services/appmgr/examples/BUILD.gn +++ b/services/appmgr/examples/BUILD.gn @@ -50,7 +50,6 @@ ohos_executable("appmgrserviceregtest") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/aafwk/standard/services/appmgr:libams", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", #"startup:appspawn_jni", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", @@ -59,6 +58,7 @@ ohos_executable("appmgrserviceregtest") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/appmgr/test/BUILD.gn b/services/appmgr/test/BUILD.gn index 845e14df8f..240e38fe16 100644 --- a/services/appmgr/test/BUILD.gn +++ b/services/appmgr/test/BUILD.gn @@ -87,11 +87,11 @@ ohos_source_set("appmgr_test_source") { "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] external_deps = [ + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", diff --git a/services/appmgr/test/unittest/ams_ability_running_record_test/BUILD.gn b/services/appmgr/test/unittest/ams_ability_running_record_test/BUILD.gn index 2248c31b4c..812dda1f9f 100644 --- a/services/appmgr/test/unittest/ams_ability_running_record_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_ability_running_record_test/BUILD.gn @@ -60,11 +60,11 @@ ohos_unittest("AmsAbilityRunningRecordTest") { "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/aafwk/standard/services/appmgr:libams", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", ] external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", diff --git a/services/appmgr/test/unittest/ams_app_death_recipient_test/BUILD.gn b/services/appmgr/test/unittest/ams_app_death_recipient_test/BUILD.gn index e951dbe7c6..a0aa94dae0 100644 --- a/services/appmgr/test/unittest/ams_app_death_recipient_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_app_death_recipient_test/BUILD.gn @@ -55,7 +55,6 @@ ohos_unittest("AppDeathRecipientTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", @@ -73,6 +72,7 @@ ohos_unittest("AppDeathRecipientTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", diff --git a/services/appmgr/test/unittest/ams_app_life_cycle_test/BUILD.gn b/services/appmgr/test/unittest/ams_app_life_cycle_test/BUILD.gn index 904b061dd9..0d4dd61533 100644 --- a/services/appmgr/test/unittest/ams_app_life_cycle_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_app_life_cycle_test/BUILD.gn @@ -55,7 +55,6 @@ ohos_unittest("AmsAppLifeCycleTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", @@ -71,6 +70,7 @@ ohos_unittest("AmsAppLifeCycleTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", diff --git a/services/appmgr/test/unittest/ams_app_mgr_client_test/BUILD.gn b/services/appmgr/test/unittest/ams_app_mgr_client_test/BUILD.gn index 370e73e780..6ed075aa5c 100644 --- a/services/appmgr/test/unittest/ams_app_mgr_client_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_app_mgr_client_test/BUILD.gn @@ -50,12 +50,12 @@ ohos_unittest("AmsAppMgrClientTest") { "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/appmgr/test/unittest/ams_app_running_record_test/BUILD.gn b/services/appmgr/test/unittest/ams_app_running_record_test/BUILD.gn index 868a72d1c8..a21cca556e 100644 --- a/services/appmgr/test/unittest/ams_app_running_record_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_app_running_record_test/BUILD.gn @@ -57,11 +57,11 @@ ohos_unittest("AmsAppRunningRecordTest") { "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//foundation/aafwk/standard/services/appmgr:libams", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", ] external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", diff --git a/services/appmgr/test/unittest/ams_app_state_callback_test/BUILD.gn b/services/appmgr/test/unittest/ams_app_state_callback_test/BUILD.gn index 58044684b0..c6eab08763 100644 --- a/services/appmgr/test/unittest/ams_app_state_callback_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_app_state_callback_test/BUILD.gn @@ -43,12 +43,12 @@ ohos_unittest("AmsAppStateCallbackTest") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_path}/common:libappexecfwk_common", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//third_party/googletest:gmock_main", "//utils/native/base:utils", ] external_deps = [ + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/appmgr/test/unittest/ams_app_workflow_test/BUILD.gn b/services/appmgr/test/unittest/ams_app_workflow_test/BUILD.gn index 5661ddcbfb..8477c15a6d 100644 --- a/services/appmgr/test/unittest/ams_app_workflow_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_app_workflow_test/BUILD.gn @@ -53,7 +53,6 @@ ohos_unittest("AmsWorkFlowTest") { deps = [ "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", @@ -68,6 +67,7 @@ ohos_unittest("AmsWorkFlowTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", diff --git a/services/appmgr/test/unittest/ams_cgroup_manager_test/BUILD.gn b/services/appmgr/test/unittest/ams_cgroup_manager_test/BUILD.gn index e5c7ca85ad..0503c4929f 100644 --- a/services/appmgr/test/unittest/ams_cgroup_manager_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_cgroup_manager_test/BUILD.gn @@ -39,13 +39,15 @@ ohos_unittest("AmsCgroupManagerTest") { } deps = [ "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/appmgr/test:appmgr_test_source", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "bundle_framework:appexecfwk_core", + "hiviewdfx_hilog_native:libhilog", + ] } group("unittest") { diff --git a/services/appmgr/test/unittest/ams_ipc_interface_test/BUILD.gn b/services/appmgr/test/unittest/ams_ipc_interface_test/BUILD.gn index ec7312e5db..87f75d614a 100644 --- a/services/appmgr/test/unittest/ams_ipc_interface_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_ipc_interface_test/BUILD.gn @@ -55,10 +55,10 @@ ohos_unittest("AmsIpcAppMgrInterfaceTest") { "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/appmgr/test/unittest/ams_lmks_client_test/BUILD.gn b/services/appmgr/test/unittest/ams_lmks_client_test/BUILD.gn index 8e0af25a78..a8a285848c 100644 --- a/services/appmgr/test/unittest/ams_lmks_client_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_lmks_client_test/BUILD.gn @@ -38,7 +38,6 @@ ohos_unittest("AmsLmksClientTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/appmgr/test:appmgr_test_source", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", @@ -46,6 +45,7 @@ ohos_unittest("AmsLmksClientTest") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/appmgr/test/unittest/ams_mgr_scheduler_test/BUILD.gn b/services/appmgr/test/unittest/ams_mgr_scheduler_test/BUILD.gn index cb8c1d5523..19c509215a 100644 --- a/services/appmgr/test/unittest/ams_mgr_scheduler_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_mgr_scheduler_test/BUILD.gn @@ -45,7 +45,6 @@ ohos_unittest("AmsMgrSchedulerTest") { } deps = [ "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/appmgr/test:appmgr_test_source", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", @@ -53,6 +52,7 @@ ohos_unittest("AmsMgrSchedulerTest") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/appmgr/test/unittest/ams_process_optimizer_test/BUILD.gn b/services/appmgr/test/unittest/ams_process_optimizer_test/BUILD.gn index a6dca78f45..b0f829ab26 100644 --- a/services/appmgr/test/unittest/ams_process_optimizer_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_process_optimizer_test/BUILD.gn @@ -49,7 +49,6 @@ ohos_unittest("AmsamsProcessOptimizerTest") { } deps = [ "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/appmgr/test:appmgr_test_source", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", @@ -57,6 +56,7 @@ ohos_unittest("AmsamsProcessOptimizerTest") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/appmgr/test/unittest/ams_recent_app_list_test/BUILD.gn b/services/appmgr/test/unittest/ams_recent_app_list_test/BUILD.gn index 297d94e81e..ca683fece2 100644 --- a/services/appmgr/test/unittest/ams_recent_app_list_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_recent_app_list_test/BUILD.gn @@ -53,7 +53,6 @@ ohos_unittest("AmsRecentAppListTest") { configs = [ "${appexecfwk_path}/libs/libeventhandler:libeventhandler_config" ] deps = [ - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", @@ -69,6 +68,7 @@ ohos_unittest("AmsRecentAppListTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", diff --git a/services/appmgr/test/unittest/ams_service_app_spawn_client_test/BUILD.gn b/services/appmgr/test/unittest/ams_service_app_spawn_client_test/BUILD.gn index 0013352c2a..dc2df38334 100644 --- a/services/appmgr/test/unittest/ams_service_app_spawn_client_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_service_app_spawn_client_test/BUILD.gn @@ -59,12 +59,12 @@ ohos_unittest("AmsServiceAppSpawnClientTest") { "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/aafwk/standard/services/appmgr:libams", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", diff --git a/services/appmgr/test/unittest/ams_service_event_drive_test/BUILD.gn b/services/appmgr/test/unittest/ams_service_event_drive_test/BUILD.gn index f0f315d9d9..d69e8ee19b 100644 --- a/services/appmgr/test/unittest/ams_service_event_drive_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_service_event_drive_test/BUILD.gn @@ -61,12 +61,12 @@ ohos_unittest("AmsServiceEventDriveTest") { "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/aafwk/standard/services/appmgr:libams", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", diff --git a/services/appmgr/test/unittest/ams_service_load_ability_process_test/BUILD.gn b/services/appmgr/test/unittest/ams_service_load_ability_process_test/BUILD.gn index 166feb363e..7a7b2fc2b5 100644 --- a/services/appmgr/test/unittest/ams_service_load_ability_process_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_service_load_ability_process_test/BUILD.gn @@ -57,7 +57,6 @@ ohos_unittest("AmsServiceLoadAbilityProcessTest") { } deps = [ "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", @@ -73,6 +72,7 @@ ohos_unittest("AmsServiceLoadAbilityProcessTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", diff --git a/services/appmgr/test/unittest/ams_service_startup_test/BUILD.gn b/services/appmgr/test/unittest/ams_service_startup_test/BUILD.gn index 181bd79b89..8b6a691ebb 100644 --- a/services/appmgr/test/unittest/ams_service_startup_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_service_startup_test/BUILD.gn @@ -57,13 +57,13 @@ ohos_unittest("AmsServiceStartupTest") { "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/aafwk/standard/services/appmgr:libams", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//utils/native/base:utils", ] external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", diff --git a/services/appmgr/test/unittest/app_mgr_service_event_handler_test/BUILD.gn b/services/appmgr/test/unittest/app_mgr_service_event_handler_test/BUILD.gn index 7fc5e9e0c5..05d0da1d21 100644 --- a/services/appmgr/test/unittest/app_mgr_service_event_handler_test/BUILD.gn +++ b/services/appmgr/test/unittest/app_mgr_service_event_handler_test/BUILD.gn @@ -55,7 +55,6 @@ ohos_unittest("AMSEventHandlerTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", @@ -73,6 +72,7 @@ ohos_unittest("AMSEventHandlerTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", diff --git a/services/dataobsmgr/BUILD.gn b/services/dataobsmgr/BUILD.gn index 6dfd775b53..902ec1db5a 100644 --- a/services/dataobsmgr/BUILD.gn +++ b/services/dataobsmgr/BUILD.gn @@ -53,7 +53,6 @@ ohos_shared_library("dataobsms") { "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", @@ -62,6 +61,7 @@ ohos_shared_library("dataobsms") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/formmgr/test/unittest/fms_form_cache_mgr_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_cache_mgr_test/BUILD.gn index f0bbfe0cd9..38fb54c728 100644 --- a/services/formmgr/test/unittest/fms_form_cache_mgr_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_cache_mgr_test/BUILD.gn @@ -48,7 +48,6 @@ ohos_unittest("FmsFormCacheMgrTest") { "${aafwk_path}/frameworks/kits/fmskit:fmskit_native", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", @@ -63,6 +62,7 @@ ohos_unittest("FmsFormCacheMgrTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/formmgr/test/unittest/fms_form_data_mgr_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_data_mgr_test/BUILD.gn index db8192f78f..7ad8fc83d9 100644 --- a/services/formmgr/test/unittest/fms_form_data_mgr_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_data_mgr_test/BUILD.gn @@ -53,7 +53,6 @@ ohos_unittest("FmsFormDataMgrTest") { deps = [ "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${services_path}/formmgr:fms_target", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", @@ -66,6 +65,7 @@ ohos_unittest("FmsFormDataMgrTest") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/formmgr/test/unittest/fms_form_db_record_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_db_record_test/BUILD.gn index e42ba7196e..f3cde572b1 100644 --- a/services/formmgr/test/unittest/fms_form_db_record_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_db_record_test/BUILD.gn @@ -49,7 +49,6 @@ ohos_unittest("FmsFormDbRecordTest") { deps = [ "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${services_path}/formmgr:fms_target", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", @@ -62,6 +61,7 @@ ohos_unittest("FmsFormDbRecordTest") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/formmgr/test/unittest/fms_form_host_record_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_host_record_test/BUILD.gn index e1fb2b0f64..802df440ca 100644 --- a/services/formmgr/test/unittest/fms_form_host_record_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_host_record_test/BUILD.gn @@ -55,7 +55,6 @@ ohos_unittest("FmsFormHostRecordTest") { "${aafwk_path}/frameworks/kits/fmskit:fmskit_native", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", @@ -71,6 +70,7 @@ ohos_unittest("FmsFormHostRecordTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/formmgr/test/unittest/fms_form_info_mgr_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_info_mgr_test/BUILD.gn index 09711d62e8..b17c617f5a 100644 --- a/services/formmgr/test/unittest/fms_form_info_mgr_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_info_mgr_test/BUILD.gn @@ -55,7 +55,6 @@ ohos_unittest("FmsFormInfoMgrTest") { "${aafwk_path}/frameworks/kits/fmskit:fmskit_native", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", @@ -71,6 +70,7 @@ ohos_unittest("FmsFormInfoMgrTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/formmgr/test/unittest/fms_form_mgr_add_form_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_add_form_test/BUILD.gn index fb92a3cf59..7a480b2f0a 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_add_form_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_add_form_test/BUILD.gn @@ -57,7 +57,6 @@ ohos_unittest("FmsFormMgrAddFormTest") { "${aafwk_path}/frameworks/kits/fmskit:fmskit_native", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", @@ -76,6 +75,7 @@ ohos_unittest("FmsFormMgrAddFormTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/formmgr/test/unittest/fms_form_mgr_cast_temp_form_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_cast_temp_form_test/BUILD.gn index 21c3d227da..c05a1790e0 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_cast_temp_form_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_cast_temp_form_test/BUILD.gn @@ -56,7 +56,6 @@ ohos_unittest("FmsFormMgrCastTempFormTest") { "${aafwk_path}/frameworks/kits/fmskit:fmskit_native", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", @@ -72,6 +71,7 @@ ohos_unittest("FmsFormMgrCastTempFormTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/formmgr/test/unittest/fms_form_mgr_death_callback_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_death_callback_test/BUILD.gn index e8231fd539..9c20fdb068 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_death_callback_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_death_callback_test/BUILD.gn @@ -59,7 +59,6 @@ ohos_unittest("FmsFormMgrDeathCallbackTest") { "${aafwk_path}/frameworks/kits/fmskit:fmskit_native", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", @@ -77,6 +76,7 @@ ohos_unittest("FmsFormMgrDeathCallbackTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/formmgr/test/unittest/fms_form_mgr_delete_form_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_delete_form_test/BUILD.gn index 01a898436a..3af97db892 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_delete_form_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_delete_form_test/BUILD.gn @@ -58,7 +58,6 @@ ohos_unittest("FmsFormMgrDeleteFormTest") { "${aafwk_path}/frameworks/kits/fmskit:fmskit_native", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", @@ -76,6 +75,7 @@ ohos_unittest("FmsFormMgrDeleteFormTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/formmgr/test/unittest/fms_form_mgr_lifecycle_update_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_lifecycle_update_test/BUILD.gn index 4ff09d1b3a..e3a59c7283 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_lifecycle_update_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_lifecycle_update_test/BUILD.gn @@ -59,7 +59,6 @@ ohos_unittest("FmsFormMgrLifecycleUpdateTest") { deps = [ "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${services_path}/formmgr:fms_target", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", @@ -75,6 +74,7 @@ ohos_unittest("FmsFormMgrLifecycleUpdateTest") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", diff --git a/services/formmgr/test/unittest/fms_form_mgr_message_event_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_message_event_test/BUILD.gn index 090152cd7b..0cf56e0942 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_message_event_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_message_event_test/BUILD.gn @@ -57,7 +57,6 @@ ohos_unittest("FmsFormMgrMessageEventTest") { "${aafwk_path}/frameworks/kits/fmskit:fmskit_native", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", @@ -75,6 +74,7 @@ ohos_unittest("FmsFormMgrMessageEventTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/formmgr/test/unittest/fms_form_mgr_notify_invisible_forms_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_notify_invisible_forms_test/BUILD.gn index c1bd251ae4..3250af5c08 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_notify_invisible_forms_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_notify_invisible_forms_test/BUILD.gn @@ -59,7 +59,6 @@ ohos_unittest("FmsFormMgrNotifyInvisibleFormsTest") { deps = [ "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${services_path}/formmgr:fms_target", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", @@ -74,6 +73,7 @@ ohos_unittest("FmsFormMgrNotifyInvisibleFormsTest") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", diff --git a/services/formmgr/test/unittest/fms_form_mgr_notify_visible_forms_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_notify_visible_forms_test/BUILD.gn index 9c945385ae..c24ef92ddc 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_notify_visible_forms_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_notify_visible_forms_test/BUILD.gn @@ -59,7 +59,6 @@ ohos_unittest("FmsFormMgrNotifyVisibleFormsTest") { deps = [ "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${services_path}/formmgr:fms_target", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", @@ -74,6 +73,7 @@ ohos_unittest("FmsFormMgrNotifyVisibleFormsTest") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", diff --git a/services/formmgr/test/unittest/fms_form_mgr_release_form_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_release_form_test/BUILD.gn index 6638bfc119..a6e30a459b 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_release_form_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_release_form_test/BUILD.gn @@ -56,7 +56,6 @@ ohos_unittest("FmsFormMgrReleaseFormTest") { "${aafwk_path}/frameworks/kits/fmskit:fmskit_native", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", @@ -71,6 +70,7 @@ ohos_unittest("FmsFormMgrReleaseFormTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/formmgr/test/unittest/fms_form_mgr_request_form_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_request_form_test/BUILD.gn index 00713a1a04..1aaa58a162 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_request_form_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_request_form_test/BUILD.gn @@ -56,7 +56,6 @@ ohos_unittest("FmsFormMgrRequestFormTest") { "${aafwk_path}/frameworks/kits/fmskit:fmskit_native", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", @@ -71,6 +70,7 @@ ohos_unittest("FmsFormMgrRequestFormTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/formmgr/test/unittest/fms_form_mgr_update_form_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_mgr_update_form_test/BUILD.gn index 335454c7a4..20235d63a0 100644 --- a/services/formmgr/test/unittest/fms_form_mgr_update_form_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_mgr_update_form_test/BUILD.gn @@ -57,7 +57,6 @@ ohos_unittest("FmsFormMgrUpdateFormTest") { "${aafwk_path}/frameworks/kits/fmskit:fmskit_native", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", @@ -75,6 +74,7 @@ ohos_unittest("FmsFormMgrUpdateFormTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/formmgr/test/unittest/fms_form_provider_data_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_provider_data_test/BUILD.gn index 967facddea..267bfff948 100644 --- a/services/formmgr/test/unittest/fms_form_provider_data_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_provider_data_test/BUILD.gn @@ -41,7 +41,6 @@ ohos_unittest("FmsFormProviderDataTest") { deps = [ "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${services_path}/formmgr:fms_target", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/aafwk/standard/interfaces/innerkits/base:base", @@ -52,6 +51,7 @@ ohos_unittest("FmsFormProviderDataTest") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/formmgr/test/unittest/fms_form_provider_mgr_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_provider_mgr_test/BUILD.gn index 7b46061098..89a6f020e2 100644 --- a/services/formmgr/test/unittest/fms_form_provider_mgr_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_provider_mgr_test/BUILD.gn @@ -56,7 +56,6 @@ ohos_unittest("FmsFormProviderMgrTest") { "${aafwk_path}/frameworks/kits/fmskit:fmskit_native", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", @@ -72,6 +71,7 @@ ohos_unittest("FmsFormProviderMgrTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "form_runtime:form_manager", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/formmgr/test/unittest/fms_form_set_next_refresh_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_set_next_refresh_test/BUILD.gn index 363a26ca4a..4718bf5a07 100644 --- a/services/formmgr/test/unittest/fms_form_set_next_refresh_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_set_next_refresh_test/BUILD.gn @@ -58,7 +58,6 @@ ohos_unittest("FmsFormSetNextRefreshTest") { "${aafwk_path}/frameworks/kits/fmskit:fmskit_native", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${services_path}/formmgr:fms_target", "//base/miscservices/time/services:time_service", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", @@ -78,6 +77,7 @@ ohos_unittest("FmsFormSetNextRefreshTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "form_runtime:form_manager", diff --git a/services/formmgr/test/unittest/fms_form_sys_event_receiver_test/BUILD.gn b/services/formmgr/test/unittest/fms_form_sys_event_receiver_test/BUILD.gn index da54f852ae..120d20aaab 100644 --- a/services/formmgr/test/unittest/fms_form_sys_event_receiver_test/BUILD.gn +++ b/services/formmgr/test/unittest/fms_form_sys_event_receiver_test/BUILD.gn @@ -58,7 +58,6 @@ ohos_unittest("FmsFormSysEventReceiverTest") { "${aafwk_path}/frameworks/kits/fmskit:fmskit_native", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/formmgr:fms_target", "//base/miscservices/time/services:time_service", @@ -80,6 +79,7 @@ ohos_unittest("FmsFormSysEventReceiverTest") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "form_runtime:form_manager", diff --git a/services/test/moduletest/ability_mgr_service_test/BUILD.gn b/services/test/moduletest/ability_mgr_service_test/BUILD.gn index 8737635601..10d7c43702 100644 --- a/services/test/moduletest/ability_mgr_service_test/BUILD.gn +++ b/services/test/moduletest/ability_mgr_service_test/BUILD.gn @@ -96,7 +96,6 @@ ohos_moduletest("ability_mgr_module_test") { "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", @@ -111,6 +110,7 @@ ohos_moduletest("ability_mgr_module_test") { external_deps = [ "access_token:libaccesstoken_sdk", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", diff --git a/services/test/moduletest/ability_record_test/BUILD.gn b/services/test/moduletest/ability_record_test/BUILD.gn index e59b1ed293..6f423903cc 100644 --- a/services/test/moduletest/ability_record_test/BUILD.gn +++ b/services/test/moduletest/ability_record_test/BUILD.gn @@ -100,7 +100,6 @@ ohos_moduletest("AbilityRecordModuleTest") { "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", @@ -115,6 +114,7 @@ ohos_moduletest("AbilityRecordModuleTest") { external_deps = [ "access_token:libaccesstoken_sdk", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", diff --git a/services/test/moduletest/ability_stack_test/BUILD.gn b/services/test/moduletest/ability_stack_test/BUILD.gn index d90794db20..a8ad5657a9 100644 --- a/services/test/moduletest/ability_stack_test/BUILD.gn +++ b/services/test/moduletest/ability_stack_test/BUILD.gn @@ -98,7 +98,6 @@ ohos_moduletest("ability_stack_module_test") { "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", @@ -113,6 +112,7 @@ ohos_moduletest("ability_stack_module_test") { external_deps = [ "access_token:libaccesstoken_sdk", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", diff --git a/services/test/moduletest/common/ams/BUILD.gn b/services/test/moduletest/common/ams/BUILD.gn index 704ad3dcb3..8ffd385cc3 100755 --- a/services/test/moduletest/common/ams/BUILD.gn +++ b/services/test/moduletest/common/ams/BUILD.gn @@ -84,7 +84,6 @@ ohos_source_set("appmgr_mst_source") { "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -93,6 +92,7 @@ ohos_source_set("appmgr_mst_source") { external_deps = [ "appspawn:appspawn_socket_client", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", diff --git a/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn b/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn index 9341420fdc..34913b2ed8 100644 --- a/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn +++ b/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn @@ -36,7 +36,6 @@ ohos_moduletest("IpcAbilityMgrServiceModuleTest") { "${services_path}/common:perm_verification", "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -46,6 +45,7 @@ ohos_moduletest("IpcAbilityMgrServiceModuleTest") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn b/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn index 9c07fbc05c..236fe8e9b7 100644 --- a/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn +++ b/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn @@ -52,7 +52,6 @@ ohos_moduletest("IpcAbilitySchedulerModuleTest") { "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -62,6 +61,7 @@ ohos_moduletest("IpcAbilitySchedulerModuleTest") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "native_appdatamgr:native_appdatafwk", diff --git a/services/test/moduletest/panding_want_manager_test/BUILD.gn b/services/test/moduletest/panding_want_manager_test/BUILD.gn index 356fb53e78..48ff0f1751 100755 --- a/services/test/moduletest/panding_want_manager_test/BUILD.gn +++ b/services/test/moduletest/panding_want_manager_test/BUILD.gn @@ -62,7 +62,6 @@ ohos_moduletest("PandingWantMgrTest") { "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", @@ -77,6 +76,7 @@ ohos_moduletest("PandingWantMgrTest") { external_deps = [ "access_token:libaccesstoken_sdk", + "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/BUILD.gn index a2a784790d..f325c69aba 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/BUILD.gn @@ -55,7 +55,6 @@ ohos_shared_library("amsAbilityAppendTestA") { "${aafwk_path}/interfaces/innerkits/want:want", "${common_path}:libappexecfwk_common", "${innerkits_path}/appexecfwk_base:appexecfwk_base", - "${innerkits_path}/appexecfwk_core:appexecfwk_core", "${services_path}/bundlemgr:libbms", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb:native_rdb", @@ -64,6 +63,7 @@ ohos_shared_library("amsAbilityAppendTestA") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/BUILD.gn index 0d9c6c4835..582054c0f6 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/BUILD.gn @@ -54,7 +54,6 @@ ohos_shared_library("amsAbilityAppendTestB") { "${aafwk_path}/interfaces/innerkits/want:want", "${common_path}:libappexecfwk_common", "${innerkits_path}/appexecfwk_base:appexecfwk_base", - "${innerkits_path}/appexecfwk_core:appexecfwk_core", "${services_path}/bundlemgr:libbms", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb:native_rdb", @@ -63,6 +62,7 @@ ohos_shared_library("amsAbilityAppendTestB") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn index f59a1918ea..23063cf427 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn @@ -54,7 +54,6 @@ ohos_shared_library("amsAbilityVisibleTestPageA") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb:native_rdb", @@ -62,6 +61,7 @@ ohos_shared_library("amsAbilityVisibleTestPageA") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn index 405131df62..80f59a29f3 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn @@ -54,7 +54,6 @@ ohos_shared_library("amsAbilityVisibleTestServiceB") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb:native_rdb", @@ -62,6 +61,7 @@ ohos_shared_library("amsAbilityVisibleTestServiceB") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedSingletonTest/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedSingletonTest/BUILD.gn index 7165180427..f87527eb3e 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedSingletonTest/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedSingletonTest/BUILD.gn @@ -54,12 +54,12 @@ ohos_shared_library("amsConfigurationUpdatedSingletonTest") { "${aafwk_path}/services/abilitymgr:abilityms", "${common_path}:libappexecfwk_common", "${innerkits_path}/appexecfwk_base:appexecfwk_base", - "${innerkits_path}/appexecfwk_core:appexecfwk_core", "${services_path}/bundlemgr:libbms", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/BUILD.gn index caf004688a..79d8003ada 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/BUILD.gn @@ -55,12 +55,12 @@ ohos_shared_library("amsConfigurationUpdatedTest") { "${aafwk_path}/services/abilitymgr:abilityms", "${common_path}:libappexecfwk_common", "${innerkits_path}/appexecfwk_base:appexecfwk_base", - "${innerkits_path}/appexecfwk_core:appexecfwk_core", "${services_path}/bundlemgr:libbms", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn index 664cf5c313..a36318fde5 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn @@ -56,7 +56,6 @@ ohos_shared_library("amsDataSystemTestA") { "${aafwk_path}/interfaces/innerkits/want:want", "${common_path}:libappexecfwk_common", "${innerkits_path}/appexecfwk_base:appexecfwk_base", - "${innerkits_path}/appexecfwk_core:appexecfwk_core", "${services_path}/bundlemgr:libbms", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb:native_rdb", @@ -65,6 +64,7 @@ ohos_shared_library("amsDataSystemTestA") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn index cdfce918f3..de3e424af4 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn @@ -55,7 +55,6 @@ ohos_shared_library("amsDataSystemTestB") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb:native_rdb", @@ -64,6 +63,7 @@ ohos_shared_library("amsDataSystemTestB") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn index 37c318b7a7..31c2c1abfe 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn @@ -55,7 +55,6 @@ ohos_shared_library("amsDataSystemTestC") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb:native_rdb", @@ -64,6 +63,7 @@ ohos_shared_library("amsDataSystemTestC") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/BUILD.gn index 8008ae0a78..6f7f222751 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/BUILD.gn @@ -48,7 +48,6 @@ ohos_shared_library("amsKitSTAbilityManager") { "${aafwk_path}/interfaces/innerkits/want:want", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", @@ -56,6 +55,7 @@ ohos_shared_library("amsKitSTAbilityManager") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/BUILD.gn index 0c85c4396a..6ed92eb5a2 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/BUILD.gn @@ -52,7 +52,6 @@ ohos_shared_library("amsKitSTAbilityManagerFirst") { "${aafwk_path}/interfaces/innerkits/want:want", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", @@ -61,6 +60,7 @@ ohos_shared_library("amsKitSTAbilityManagerFirst") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/BUILD.gn index 0c9376ffec..260c300802 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/BUILD.gn @@ -58,7 +58,6 @@ ohos_shared_library("amsKitSystemTest") { "${aafwk_path}/interfaces/innerkits/want:want", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", @@ -67,6 +66,7 @@ ohos_shared_library("amsKitSystemTest") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/BUILD.gn index c3582cdfed..d114092c27 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/BUILD.gn @@ -55,13 +55,13 @@ ohos_shared_library("amsKitSystemTestA") { "${aafwk_path}/interfaces/innerkits/want:want", "${common_path}:libappexecfwk_common", "${innerkits_path}/appexecfwk_base:appexecfwk_base", - "${innerkits_path}/appexecfwk_core:appexecfwk_core", "${services_path}/bundlemgr:libbms", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/BUILD.gn index 4a1d91d630..e99b080b5b 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/BUILD.gn @@ -54,13 +54,13 @@ ohos_shared_library("amsKitSystemTestB") { "${aafwk_path}/interfaces/innerkits/want:want", "${common_path}:libappexecfwk_common", "${innerkits_path}/appexecfwk_base:appexecfwk_base", - "${innerkits_path}/appexecfwk_core:appexecfwk_core", "${services_path}/bundlemgr:libbms", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn index c339cd2260..3efa40fb52 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn @@ -59,7 +59,6 @@ ohos_shared_library("amsKitSystemTestDataA") { "${aafwk_path}/interfaces/innerkits/want:want", "${common_path}:libappexecfwk_common", "${innerkits_path}/appexecfwk_base:appexecfwk_base", - "${innerkits_path}/appexecfwk_core:appexecfwk_core", "${services_path}/bundlemgr:libbms", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb:native_rdb", @@ -68,6 +67,7 @@ ohos_shared_library("amsKitSystemTestDataA") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn index 8539bbdcc9..db46da6fb5 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn @@ -57,7 +57,6 @@ ohos_shared_library("amsKitSystemTestDataB") { "${aafwk_path}/interfaces/innerkits/want:want", "${common_path}:libappexecfwk_common", "${innerkits_path}/appexecfwk_base:appexecfwk_base", - "${innerkits_path}/appexecfwk_core:appexecfwk_core", "${services_path}/bundlemgr:libbms", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb:native_rdb", @@ -66,6 +65,7 @@ ohos_shared_library("amsKitSystemTestDataB") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/BUILD.gn index 5467877ffe..95b12c1ec6 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/BUILD.gn @@ -53,13 +53,13 @@ ohos_shared_library("amsKitSystemTestPageA") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "${libs_path}/libeventhandler:libeventhandler_target", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn index 0244c73907..d3ac593b06 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn @@ -58,13 +58,13 @@ ohos_shared_library("amsKitSystemTestService") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "${libs_path}/libeventhandler:libeventhandler_target", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsMissionStackTest/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsMissionStackTest/BUILD.gn index f28083ee1c..7239cc03fe 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsMissionStackTest/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsMissionStackTest/BUILD.gn @@ -55,12 +55,12 @@ ohos_shared_library("amsMissionStackTest") { "${aafwk_path}/interfaces/innerkits/want:want", "${common_path}:libappexecfwk_common", "${innerkits_path}/appexecfwk_base:appexecfwk_base", - "${innerkits_path}/appexecfwk_core:appexecfwk_core", "${services_path}/bundlemgr:libbms", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/resource/amssystemtestability/abilitySrc/amsMissionStackTestSubsidiary/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsMissionStackTestSubsidiary/BUILD.gn index dbd22d08de..1c62f3de91 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsMissionStackTestSubsidiary/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsMissionStackTestSubsidiary/BUILD.gn @@ -56,12 +56,12 @@ ohos_shared_library("amsMissionStackTestSubsidiary") { "${aafwk_path}/services/abilitymgr:abilityms", "${common_path}:libappexecfwk_common", "${innerkits_path}/appexecfwk_base:appexecfwk_base", - "${innerkits_path}/appexecfwk_core:appexecfwk_core", "${services_path}/bundlemgr:libbms", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn index 1e0fab8598..fe7afd12c6 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn @@ -57,13 +57,13 @@ ohos_shared_library("amsStDataAbility") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//utils/native/base:utilsbase", ] public_deps = [ "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr:distributedschedsvr" ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "native_appdatamgr:native_appdatafwk", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn index a276b31bf2..7febe65f7a 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn @@ -51,12 +51,12 @@ ohos_shared_library("amsSystemTestA") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn index 82e7de1003..52b3d992ff 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn @@ -46,12 +46,12 @@ ohos_shared_library("amsSystemTestB") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn index 40384743d7..86b459f9d1 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn @@ -48,12 +48,12 @@ ohos_shared_library("amsSystemTestC") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn index 94a36d50c8..c6782161cd 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn @@ -47,12 +47,12 @@ ohos_shared_library("amsSystemTestD") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn index 1ec8d7cbe5..a28283986a 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn @@ -49,13 +49,13 @@ ohos_shared_library("amsSystemTestDFX") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn index 42796c0285..7d44510b66 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn @@ -46,12 +46,12 @@ ohos_shared_library("amsSystemTestE") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK/BUILD.gn index d6eb31cf88..2999ae9133 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK/BUILD.gn @@ -41,12 +41,12 @@ ohos_shared_library("amsSystemTestErrorK") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL/BUILD.gn index 618cc54897..80b7efff43 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL/BUILD.gn @@ -41,12 +41,12 @@ ohos_shared_library("amsSystemTestErrorL") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn index f77bf0eb7f..b617dfac2a 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn @@ -48,12 +48,12 @@ ohos_shared_library("amsSystemTestF") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn index adb36e8fd5..4b74b2520f 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn @@ -47,12 +47,12 @@ ohos_shared_library("amsSystemTestG") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn index 4c1b279053..2df87b4c8c 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn @@ -46,12 +46,12 @@ ohos_shared_library("amsSystemTestH") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn index 732a9acd10..49563db864 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn @@ -49,12 +49,12 @@ ohos_shared_library("amsSystemTestI") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn index 92d6670e86..04afe388d6 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn @@ -46,12 +46,12 @@ ohos_shared_library("amsSystemTestM") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn index 643484b9bc..43515067ff 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn @@ -49,12 +49,12 @@ ohos_shared_library("amsSystemTestN") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn index d7d3a48412..981dbd1c9a 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn @@ -46,12 +46,12 @@ ohos_shared_library("amsSystemTestO") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn index fc80971bd6..633d65a0da 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn @@ -46,12 +46,12 @@ ohos_shared_library("amsSystemTestP") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn index 1bcababb3f..2444686d70 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn @@ -49,12 +49,12 @@ ohos_shared_library("amsSystemTestQ") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn index e8233dd104..bada175db2 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn @@ -49,12 +49,12 @@ ohos_shared_library("amsSystemTestR") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceA/BUILD.gn index a87b636e91..fe91a2c4c3 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceA/BUILD.gn @@ -44,11 +44,11 @@ ohos_shared_library("amsSystemTestServiceA") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceB/BUILD.gn index 6e34f41528..829df0feb7 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceB/BUILD.gn @@ -47,12 +47,12 @@ ohos_shared_library("amsSystemTestServiceB") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceC/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceC/BUILD.gn index 8c5ad15e84..aae1efdb3c 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceC/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceC/BUILD.gn @@ -43,12 +43,12 @@ ohos_shared_library("amsSystemTestServiceC") { "${aafwk_path}/interfaces/innerkits/want:want", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceD/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceD/BUILD.gn index 6d4d6d96ef..b5a7ab1a77 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceD/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceD/BUILD.gn @@ -44,13 +44,13 @@ ohos_shared_library("amsSystemTestServiceD") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceE/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceE/BUILD.gn index 7b159c9011..694324a16d 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceE/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceE/BUILD.gn @@ -44,13 +44,13 @@ ohos_shared_library("amsSystemTestServiceE") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceF/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceF/BUILD.gn index 90995f967d..04e0c68587 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceF/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceF/BUILD.gn @@ -43,13 +43,13 @@ ohos_shared_library("amsSystemTestServiceF") { "${aafwk_path}/interfaces/innerkits/want:want", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceG/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceG/BUILD.gn index 243c4009ee..b9ef6e981b 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceG/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceG/BUILD.gn @@ -44,13 +44,13 @@ ohos_shared_library("amsSystemTestServiceG") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceH/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceH/BUILD.gn index 07e7175138..8dc7b6ca17 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceH/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceH/BUILD.gn @@ -44,13 +44,13 @@ ohos_shared_library("amsSystemTestServiceH") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/BUILD.gn index 054b450a75..82f475d67c 100644 --- a/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/BUILD.gn @@ -51,11 +51,11 @@ ohos_shared_library("fwkAbilityState") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/BUILD.gn index 81e72023cd..6916c66e8a 100755 --- a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/BUILD.gn @@ -59,13 +59,13 @@ ohos_shared_library("taskDispatcherTestA") { "${aafwk_path}/interfaces/innerkits/want:want", "${common_path}:libappexecfwk_common", "${innerkits_path}/appexecfwk_base:appexecfwk_base", - "${innerkits_path}/appexecfwk_core:appexecfwk_core", "${services_path}/bundlemgr:libbms", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/BUILD.gn index 773b9781b8..0ada1835d3 100755 --- a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/BUILD.gn @@ -59,13 +59,13 @@ ohos_shared_library("taskDispatcherTestB") { "${aafwk_path}/interfaces/innerkits/want:want", "${common_path}:libappexecfwk_common", "${innerkits_path}/appexecfwk_base:appexecfwk_base", - "${innerkits_path}/appexecfwk_core:appexecfwk_core", "${services_path}/bundlemgr:libbms", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn b/test/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn index 6963ef0ded..44f4e1a0a5 100755 --- a/test/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn +++ b/test/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn @@ -53,7 +53,6 @@ ohos_shared_library("fmsSystemPerformance") { "${aafwk_path}/interfaces/innerkits/want:want", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", @@ -62,6 +61,7 @@ ohos_shared_library("fmsSystemPerformance") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "form_runtime:form_manager", diff --git a/test/resource/formsystemtestability/fmsSystemStress/BUILD.gn b/test/resource/formsystemtestability/fmsSystemStress/BUILD.gn index fe15268f31..ac3502f6e9 100755 --- a/test/resource/formsystemtestability/fmsSystemStress/BUILD.gn +++ b/test/resource/formsystemtestability/fmsSystemStress/BUILD.gn @@ -53,7 +53,6 @@ ohos_shared_library("fmsSystemStress") { "${aafwk_path}/interfaces/innerkits/want:want", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", @@ -62,6 +61,7 @@ ohos_shared_library("fmsSystemStress") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "form_runtime:form_manager", diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn b/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn index be7b877759..41383f4537 100755 --- a/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn +++ b/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn @@ -53,7 +53,6 @@ ohos_shared_library("fmsSystemTestHostNoPerm") { "${aafwk_path}/interfaces/innerkits/want:want", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", @@ -62,6 +61,7 @@ ohos_shared_library("fmsSystemTestHostNoPerm") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "form_runtime:form_manager", diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn b/test/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn index 9e6ddf55f6..4fe0c83723 100755 --- a/test/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn +++ b/test/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn @@ -53,7 +53,6 @@ ohos_shared_library("fmsSystemTestHostNotSys") { "${aafwk_path}/interfaces/innerkits/want:want", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", @@ -62,6 +61,7 @@ ohos_shared_library("fmsSystemTestHostNotSys") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "form_runtime:form_manager", diff --git a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn b/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn index d7ce1f7245..0e7e2104d6 100755 --- a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn +++ b/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn @@ -53,7 +53,6 @@ ohos_shared_library("selfStartingTestHostA") { "${aafwk_path}/interfaces/innerkits/want:want", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", @@ -62,6 +61,7 @@ ohos_shared_library("selfStartingTestHostA") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "form_runtime:form_manager", diff --git a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn b/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn index 9bab35736c..4295d0d3a8 100755 --- a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn +++ b/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn @@ -53,7 +53,6 @@ ohos_shared_library("selfStartingTestHostB") { "${aafwk_path}/interfaces/innerkits/want:want", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", @@ -62,6 +61,7 @@ ohos_shared_library("selfStartingTestHostB") { "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "form_runtime:form_manager", diff --git a/test/resource/formsystemtestability/formSystemTestServiceA/BUILD.gn b/test/resource/formsystemtestability/formSystemTestServiceA/BUILD.gn index 5eaf2f50bb..afafadce8e 100644 --- a/test/resource/formsystemtestability/formSystemTestServiceA/BUILD.gn +++ b/test/resource/formsystemtestability/formSystemTestServiceA/BUILD.gn @@ -45,11 +45,11 @@ ohos_shared_library("formSystemTestServiceA") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "form_runtime:form_manager", diff --git a/test/resource/formsystemtestability/formSystemTestServiceB/BUILD.gn b/test/resource/formsystemtestability/formSystemTestServiceB/BUILD.gn index d76aaf333b..7de000d061 100644 --- a/test/resource/formsystemtestability/formSystemTestServiceB/BUILD.gn +++ b/test/resource/formsystemtestability/formSystemTestServiceB/BUILD.gn @@ -45,11 +45,11 @@ ohos_shared_library("formSystemTestServiceB") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "form_runtime:form_manager", diff --git a/test/resource/formsystemtestability/formSystemTestServiceC/BUILD.gn b/test/resource/formsystemtestability/formSystemTestServiceC/BUILD.gn index 73413e024f..4205b4f41e 100644 --- a/test/resource/formsystemtestability/formSystemTestServiceC/BUILD.gn +++ b/test/resource/formsystemtestability/formSystemTestServiceC/BUILD.gn @@ -45,11 +45,11 @@ ohos_shared_library("formSystemTestServiceC") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "form_runtime:form_manager", diff --git a/test/resource/formsystemtestability/formSystemTestServiceD/BUILD.gn b/test/resource/formsystemtestability/formSystemTestServiceD/BUILD.gn index 14703ff26a..e76a396de9 100644 --- a/test/resource/formsystemtestability/formSystemTestServiceD/BUILD.gn +++ b/test/resource/formsystemtestability/formSystemTestServiceD/BUILD.gn @@ -45,11 +45,11 @@ ohos_shared_library("formSystemTestServiceD") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "form_runtime:form_manager", diff --git a/test/resource/formsystemtestability/formSystemTestServiceE/BUILD.gn b/test/resource/formsystemtestability/formSystemTestServiceE/BUILD.gn index 11ad6a87d6..a5687763e2 100644 --- a/test/resource/formsystemtestability/formSystemTestServiceE/BUILD.gn +++ b/test/resource/formsystemtestability/formSystemTestServiceE/BUILD.gn @@ -45,11 +45,11 @@ ohos_shared_library("formSystemTestServiceE") { "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/services/bundlemgr:libbms", "//utils/native/base:utilsbase", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "form_runtime:form_manager", diff --git a/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn b/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn index c869fc0aa2..894deeda53 100755 --- a/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn @@ -47,7 +47,6 @@ ohos_systemtest("ams_aa_command_test") { "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -56,6 +55,7 @@ ohos_systemtest("ams_aa_command_test") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn b/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn index ba3a315435..31b8600f62 100755 --- a/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn @@ -45,7 +45,6 @@ ohos_systemtest("ams_ability_append_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -54,6 +53,7 @@ ohos_systemtest("ams_ability_append_test") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/systemtest/common/ams/ams_ability_state_age_manual_test/BUILD.gn b/test/systemtest/common/ams/ams_ability_state_age_manual_test/BUILD.gn index 434f05196d..77d4bcfe7e 100755 --- a/test/systemtest/common/ams/ams_ability_state_age_manual_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_ability_state_age_manual_test/BUILD.gn @@ -61,7 +61,6 @@ ohos_systemtest("ams_ability_state_age_manual_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", @@ -71,6 +70,7 @@ ohos_systemtest("ams_ability_state_age_manual_test") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/systemtest/common/ams/ams_ability_state_test/BUILD.gn b/test/systemtest/common/ams/ams_ability_state_test/BUILD.gn index 6b7fbaf3ab..f484820916 100755 --- a/test/systemtest/common/ams/ams_ability_state_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_ability_state_test/BUILD.gn @@ -61,7 +61,6 @@ ohos_systemtest("ams_ability_state_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", @@ -71,6 +70,7 @@ ohos_systemtest("ams_ability_state_test") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/systemtest/common/ams/ams_ability_visible_test/BUILD.gn b/test/systemtest/common/ams/ams_ability_visible_test/BUILD.gn index e4dcf13344..9b28a1017b 100755 --- a/test/systemtest/common/ams/ams_ability_visible_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_ability_visible_test/BUILD.gn @@ -45,7 +45,6 @@ ohos_systemtest("ams_ability_visible_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -54,6 +53,7 @@ ohos_systemtest("ams_ability_visible_test") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn b/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn index 57f0d3ac76..30d060c6fd 100755 --- a/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn @@ -45,7 +45,6 @@ ohos_systemtest("ams_app_process_manage_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -54,6 +53,7 @@ ohos_systemtest("ams_app_process_manage_test") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/systemtest/common/ams/ams_check_service/BUILD.gn b/test/systemtest/common/ams/ams_check_service/BUILD.gn index 5fe6972849..fad6d548b1 100755 --- a/test/systemtest/common/ams/ams_check_service/BUILD.gn +++ b/test/systemtest/common/ams/ams_check_service/BUILD.gn @@ -60,7 +60,6 @@ ohos_systemtest("ams_check_service") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", @@ -70,6 +69,7 @@ ohos_systemtest("ams_check_service") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/test/systemtest/common/ams/ams_configuration_updated_test/BUILD.gn b/test/systemtest/common/ams/ams_configuration_updated_test/BUILD.gn index 0b0b0fbc54..e656d9fa12 100755 --- a/test/systemtest/common/ams/ams_configuration_updated_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_configuration_updated_test/BUILD.gn @@ -45,7 +45,6 @@ ohos_systemtest("ams_configuration_updated_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -54,6 +53,7 @@ ohos_systemtest("ams_configuration_updated_test") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn b/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn index 9c11fe5a08..d86d02c529 100755 --- a/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn @@ -47,7 +47,6 @@ ohos_systemtest("ams_data_ability_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -57,6 +56,7 @@ ohos_systemtest("ams_data_ability_test") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/systemtest/common/ams/ams_dfx_test/BUILD.gn b/test/systemtest/common/ams/ams_dfx_test/BUILD.gn index 6926ed55aa..c45050efe7 100755 --- a/test/systemtest/common/ams/ams_dfx_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_dfx_test/BUILD.gn @@ -45,7 +45,6 @@ ohos_systemtest("ams_dfx_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -54,6 +53,7 @@ ohos_systemtest("ams_dfx_test") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/systemtest/common/ams/ams_kit_test/BUILD.gn b/test/systemtest/common/ams/ams_kit_test/BUILD.gn index 9491c311f2..710dea17e5 100755 --- a/test/systemtest/common/ams/ams_kit_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_kit_test/BUILD.gn @@ -44,7 +44,6 @@ ohos_systemtest("ams_kit_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -52,6 +51,7 @@ ohos_systemtest("ams_kit_test") { "//utils/native/base:utils", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", @@ -88,7 +88,6 @@ ohos_systemtest("ams_kit_service_ability_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -96,6 +95,7 @@ ohos_systemtest("ams_kit_service_ability_test") { "//utils/native/base:utils", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", @@ -134,7 +134,6 @@ ohos_systemtest("ams_kit_data_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -143,6 +142,7 @@ ohos_systemtest("ams_kit_data_test") { "//utils/native/base:utils", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", @@ -180,7 +180,6 @@ ohos_systemtest("ams_kit_a_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -189,6 +188,7 @@ ohos_systemtest("ams_kit_a_test") { "//utils/native/base:utils", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", @@ -226,7 +226,6 @@ ohos_systemtest("ams_kit_want_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -234,6 +233,7 @@ ohos_systemtest("ams_kit_want_test") { "//utils/native/base:utils", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", @@ -271,7 +271,6 @@ ohos_systemtest("ams_kit_skills_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -279,6 +278,7 @@ ohos_systemtest("ams_kit_skills_test") { "//utils/native/base:utils", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", @@ -316,7 +316,6 @@ ohos_systemtest("ams_kit_lifecycle_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -324,6 +323,7 @@ ohos_systemtest("ams_kit_lifecycle_test") { "//utils/native/base:utils", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", @@ -361,7 +361,6 @@ ohos_systemtest("ams_kit_processinfo_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -369,6 +368,7 @@ ohos_systemtest("ams_kit_processinfo_test") { "//utils/native/base:utils", ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/systemtest/common/ams/ams_missionstack_test/BUILD.gn b/test/systemtest/common/ams/ams_missionstack_test/BUILD.gn index 2ce59a4578..d25dca7706 100644 --- a/test/systemtest/common/ams/ams_missionstack_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_missionstack_test/BUILD.gn @@ -47,7 +47,6 @@ ohos_systemtest("ams_missionstack_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -56,6 +55,7 @@ ohos_systemtest("ams_missionstack_test") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/systemtest/common/ams/ams_page_ability_test/BUILD.gn b/test/systemtest/common/ams/ams_page_ability_test/BUILD.gn index 2f6b611aca..742005f539 100755 --- a/test/systemtest/common/ams/ams_page_ability_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_page_ability_test/BUILD.gn @@ -44,7 +44,6 @@ ohos_systemtest("ams_page_ability_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -53,6 +52,7 @@ ohos_systemtest("ams_page_ability_test") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/systemtest/common/ams/ams_power_test/BUILD.gn b/test/systemtest/common/ams/ams_power_test/BUILD.gn index 159ac2e026..9552e71bdd 100755 --- a/test/systemtest/common/ams/ams_power_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_power_test/BUILD.gn @@ -45,7 +45,6 @@ ohos_systemtest("ams_power_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -54,6 +53,7 @@ ohos_systemtest("ams_power_test") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn b/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn index bfe0bf1033..d76f91e627 100755 --- a/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn @@ -46,7 +46,6 @@ ohos_systemtest("ams_service_ability_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -56,6 +55,7 @@ ohos_systemtest("ams_service_ability_test") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/systemtest/common/ams/tool/BUILD.gn b/test/systemtest/common/ams/tool/BUILD.gn index 7eaac1b9cb..0fb9955a93 100755 --- a/test/systemtest/common/ams/tool/BUILD.gn +++ b/test/systemtest/common/ams/tool/BUILD.gn @@ -47,7 +47,6 @@ ohos_shared_library("system_test_ability_util_lib") { "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//foundation/aafwk/standard/services/test/moduletest/module_test_dump_util:module_test_dump_util_lib", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/jsoncpp:jsoncpp", @@ -55,6 +54,7 @@ ohos_shared_library("system_test_ability_util_lib") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", diff --git a/test/systemtest/common/task_dispatcher/BUILD.gn b/test/systemtest/common/task_dispatcher/BUILD.gn index e91de9647f..ad9a01bd9a 100755 --- a/test/systemtest/common/task_dispatcher/BUILD.gn +++ b/test/systemtest/common/task_dispatcher/BUILD.gn @@ -66,7 +66,6 @@ ohos_systemtest("task_dispatcher_test") { "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", @@ -77,6 +76,7 @@ ohos_systemtest("task_dispatcher_test") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/tools/aa/BUILD.gn b/tools/aa/BUILD.gn index 7b55a42e6b..421a9a6f03 100644 --- a/tools/aa/BUILD.gn +++ b/tools/aa/BUILD.gn @@ -52,7 +52,6 @@ ohos_source_set("tools_aa_source_set") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "${innerkits_path}/base:base", "${innerkits_path}/want:want", @@ -62,6 +61,7 @@ ohos_source_set("tools_aa_source_set") { ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/tools/fm/BUILD.gn b/tools/fm/BUILD.gn index b538835ec6..5572577b61 100755 --- a/tools/fm/BUILD.gn +++ b/tools/fm/BUILD.gn @@ -54,12 +54,12 @@ ohos_source_set("tools_fm_source_set") { "${aafwk_path}/interfaces/innerkits/want:want", "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", ] external_deps = [ + "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ]