From 0def28a9e10452c28d2fd19e2e6fbab8de43d1b6 Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Mon, 15 Aug 2022 14:58:03 +0800 Subject: [PATCH] # This is a combination of 3 commits. # This is the 1st commit message: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 解决冲突 Signed-off-by: laiguizhong # This is the commit message #2: 修改BUILD.gn Signed-off-by: laiguizhong # This is the commit message #3: 修改BUILD.gn Signed-off-by: laiguizhong --- interfaces/inner_api/runtime/BUILD.gn | 2 -- services/abilitymgr/BUILD.gn | 2 +- services/appmgr/BUILD.gn | 3 +-- test/moduletest/common/ams/BUILD.gn | 2 +- test/unittest/ams_ability_running_record_test/BUILD.gn | 2 +- test/unittest/ams_app_death_recipient_test/BUILD.gn | 2 +- test/unittest/ams_app_life_cycle_test/BUILD.gn | 2 +- test/unittest/ams_app_running_record_test/BUILD.gn | 2 +- test/unittest/ams_app_workflow_test/BUILD.gn | 2 +- test/unittest/ams_recent_app_list_test/BUILD.gn | 2 +- test/unittest/ams_service_app_spawn_client_test/BUILD.gn | 2 +- test/unittest/ams_service_event_drive_test/BUILD.gn | 2 +- test/unittest/ams_service_load_ability_process_test/BUILD.gn | 2 +- test/unittest/ams_service_startup_test/BUILD.gn | 2 +- test/unittest/app_mgr_service_event_handler_test/BUILD.gn | 2 +- test/unittest/app_mgr_service_inner_test/BUILD.gn | 4 ++-- test/unittest/app_running_processes_info_test/BUILD.gn | 2 +- 17 files changed, 17 insertions(+), 20 deletions(-) diff --git a/interfaces/inner_api/runtime/BUILD.gn b/interfaces/inner_api/runtime/BUILD.gn index 7b2dab8689..d8ff6abda6 100644 --- a/interfaces/inner_api/runtime/BUILD.gn +++ b/interfaces/inner_api/runtime/BUILD.gn @@ -79,8 +79,6 @@ ohos_shared_library("runtime") { "hitrace_native:libhitrace", "init:libbegetutil", ] - } else { - external_deps += [ "startup:syspara" ] } if (ability_runtime_graphics) { diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index 0a45dbf309..ad61a2ebed 100644 --- a/services/abilitymgr/BUILD.gn +++ b/services/abilitymgr/BUILD.gn @@ -50,7 +50,7 @@ config("abilityms_config") { "//base/account/os_account/frameworks/common/account_error/include", "//base/account/os_account/frameworks/common/database/include", "//base/account/os_account/interfaces/innerkits/osaccount/native/include", - "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include", + "//base/startup/init/interfaces/innerkits/include/syspara", "${ability_runtime_innerkits_path}/wantagent/include", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime", "${bgtaskmgr_interfaces_path}/innerkits/include", diff --git a/services/appmgr/BUILD.gn b/services/appmgr/BUILD.gn index b7bcbcfcb2..134d6d7cf8 100644 --- a/services/appmgr/BUILD.gn +++ b/services/appmgr/BUILD.gn @@ -20,7 +20,6 @@ config("appmgr_config") { "${ability_runtime_services_path}/common/include", "${appspawn_path}/interfaces/innerkits/include", "${ability_runtime_path}/tools/aa/include", - "${init_path}/interfaces/innerkits/include/syspara/", ] } @@ -82,11 +81,11 @@ ohos_shared_library("libappms") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", "init:libbegetutil", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", - "startup_l2:syspara_watchagent", ] if (ability_runtime_graphics) { diff --git a/test/moduletest/common/ams/BUILD.gn b/test/moduletest/common/ams/BUILD.gn index 89ce3328a7..57410b6613 100644 --- a/test/moduletest/common/ams/BUILD.gn +++ b/test/moduletest/common/ams/BUILD.gn @@ -73,8 +73,8 @@ ohos_source_set("appmgr_mst_source") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", "ipc:ipc_core", - "startup_l2:syspara_watchagent", ] if (background_task_mgr_continuous_task_enable) { diff --git a/test/unittest/ams_ability_running_record_test/BUILD.gn b/test/unittest/ams_ability_running_record_test/BUILD.gn index bda3e108f5..3a35c73857 100644 --- a/test/unittest/ams_ability_running_record_test/BUILD.gn +++ b/test/unittest/ams_ability_running_record_test/BUILD.gn @@ -62,8 +62,8 @@ ohos_unittest("AmsAbilityRunningRecordTest") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", "ipc:ipc_core", - "startup_l2:syspara_watchagent", ] } diff --git a/test/unittest/ams_app_death_recipient_test/BUILD.gn b/test/unittest/ams_app_death_recipient_test/BUILD.gn index 038a96713c..7f40544e09 100644 --- a/test/unittest/ams_app_death_recipient_test/BUILD.gn +++ b/test/unittest/ams_app_death_recipient_test/BUILD.gn @@ -69,8 +69,8 @@ ohos_unittest("AppDeathRecipientTest") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", "ipc:ipc_core", - "startup_l2:syspara_watchagent", ] } diff --git a/test/unittest/ams_app_life_cycle_test/BUILD.gn b/test/unittest/ams_app_life_cycle_test/BUILD.gn index b92f8992ca..4761d002a9 100644 --- a/test/unittest/ams_app_life_cycle_test/BUILD.gn +++ b/test/unittest/ams_app_life_cycle_test/BUILD.gn @@ -67,8 +67,8 @@ ohos_unittest("AmsAppLifeCycleTest") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", "ipc:ipc_core", - "startup_l2:syspara_watchagent", ] } diff --git a/test/unittest/ams_app_running_record_test/BUILD.gn b/test/unittest/ams_app_running_record_test/BUILD.gn index ffc7a697f3..51dcfaa921 100644 --- a/test/unittest/ams_app_running_record_test/BUILD.gn +++ b/test/unittest/ams_app_running_record_test/BUILD.gn @@ -59,8 +59,8 @@ ohos_unittest("AmsAppRunningRecordTest") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", "ipc:ipc_core", - "startup_l2:syspara_watchagent", ] } diff --git a/test/unittest/ams_app_workflow_test/BUILD.gn b/test/unittest/ams_app_workflow_test/BUILD.gn index c2cb654ae2..db55dc2c0d 100644 --- a/test/unittest/ams_app_workflow_test/BUILD.gn +++ b/test/unittest/ams_app_workflow_test/BUILD.gn @@ -65,8 +65,8 @@ ohos_unittest("AmsWorkFlowTest") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", "ipc:ipc_core", - "startup_l2:syspara_watchagent", ] } diff --git a/test/unittest/ams_recent_app_list_test/BUILD.gn b/test/unittest/ams_recent_app_list_test/BUILD.gn index ad6777e824..82d5f6269d 100644 --- a/test/unittest/ams_recent_app_list_test/BUILD.gn +++ b/test/unittest/ams_recent_app_list_test/BUILD.gn @@ -66,8 +66,8 @@ ohos_unittest("AmsRecentAppListTest") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", "ipc:ipc_core", - "startup_l2:syspara_watchagent", ] } diff --git a/test/unittest/ams_service_app_spawn_client_test/BUILD.gn b/test/unittest/ams_service_app_spawn_client_test/BUILD.gn index 44fe453fa2..8c1ee8cca8 100644 --- a/test/unittest/ams_service_app_spawn_client_test/BUILD.gn +++ b/test/unittest/ams_service_app_spawn_client_test/BUILD.gn @@ -68,8 +68,8 @@ ohos_unittest("AmsServiceAppSpawnClientTest") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", "ipc:ipc_core", - "startup_l2:syspara_watchagent", ] subsystem_name = "ability" diff --git a/test/unittest/ams_service_event_drive_test/BUILD.gn b/test/unittest/ams_service_event_drive_test/BUILD.gn index eaf0b1ecb3..aef6043577 100644 --- a/test/unittest/ams_service_event_drive_test/BUILD.gn +++ b/test/unittest/ams_service_event_drive_test/BUILD.gn @@ -69,8 +69,8 @@ ohos_unittest("AmsServiceEventDriveTest") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", "ipc:ipc_core", - "startup_l2:syspara_watchagent", ] } diff --git a/test/unittest/ams_service_load_ability_process_test/BUILD.gn b/test/unittest/ams_service_load_ability_process_test/BUILD.gn index 058470c035..0b7199d943 100644 --- a/test/unittest/ams_service_load_ability_process_test/BUILD.gn +++ b/test/unittest/ams_service_load_ability_process_test/BUILD.gn @@ -67,8 +67,8 @@ ohos_unittest("AmsServiceLoadAbilityProcessTest") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", "ipc:ipc_core", - "startup_l2:syspara_watchagent", ] } diff --git a/test/unittest/ams_service_startup_test/BUILD.gn b/test/unittest/ams_service_startup_test/BUILD.gn index 59370084f9..1a5f104f76 100644 --- a/test/unittest/ams_service_startup_test/BUILD.gn +++ b/test/unittest/ams_service_startup_test/BUILD.gn @@ -68,8 +68,8 @@ ohos_unittest("AmsServiceStartupTest") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", "ipc:ipc_core", - "startup_l2:syspara_watchagent", ] } diff --git a/test/unittest/app_mgr_service_event_handler_test/BUILD.gn b/test/unittest/app_mgr_service_event_handler_test/BUILD.gn index 68968a68f9..ef2f54daa7 100644 --- a/test/unittest/app_mgr_service_event_handler_test/BUILD.gn +++ b/test/unittest/app_mgr_service_event_handler_test/BUILD.gn @@ -69,8 +69,8 @@ ohos_unittest("AMSEventHandlerTest") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", "ipc:ipc_core", - "startup_l2:syspara_watchagent", ] } diff --git a/test/unittest/app_mgr_service_inner_test/BUILD.gn b/test/unittest/app_mgr_service_inner_test/BUILD.gn index 0606870600..3224e5066e 100644 --- a/test/unittest/app_mgr_service_inner_test/BUILD.gn +++ b/test/unittest/app_mgr_service_inner_test/BUILD.gn @@ -37,11 +37,11 @@ ohos_unittest("AppMgrServiceInnerTest") { "c_utils:utils", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", + "init:libbegetutil", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", - "startup_l2:syspara", - "startup_l2:syspara_watchagent", ] } diff --git a/test/unittest/app_running_processes_info_test/BUILD.gn b/test/unittest/app_running_processes_info_test/BUILD.gn index a99edcb807..1446a76955 100644 --- a/test/unittest/app_running_processes_info_test/BUILD.gn +++ b/test/unittest/app_running_processes_info_test/BUILD.gn @@ -60,8 +60,8 @@ ohos_unittest("AppRunningProcessesInfoTest") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", + "init:libbeget_proxy", "ipc:ipc_core", - "startup_l2:syspara_watchagent", ] }