openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-12-30 08:04:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

# This is a combination of 3 commits.

Browse Source 
# This is the 1st commit message:

解决冲突

Signed-off-by: laiguizhong <laiguizhong@huawei.com>

# This is the commit message #2:

修改BUILD.gn

Signed-off-by: laiguizhong <laiguizhong@huawei.com>

# This is the commit message #3:

修改BUILD.gn

Signed-off-by: laiguizhong <laiguizhong@huawei.com>
This commit is contained in:
laiguizhong 2022-08-15 14:58:03 +08:00
parent 6c88835601
commit 0def28a9e1
17 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
interfaces/inner_api/runtime/BUILD.gn
View File

@ -79,8 +79,6 @@ ohos_shared_library("runtime") {
"hitrace_native:libhitrace",
"init:libbegetutil",
]
} else {
external_deps += [ "startup:syspara" ]
}
if (ability_runtime_graphics) {

2
services/abilitymgr/BUILD.gn
View File

@ -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",

3
services/appmgr/BUILD.gn
View File

@ -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) {

2
test/moduletest/common/ams/BUILD.gn
View File

@ -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) {

2
test/unittest/ams_ability_running_record_test/BUILD.gn
View File

@ -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",
]
}

2
test/unittest/ams_app_death_recipient_test/BUILD.gn
View File

@ -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",
]
}

2
test/unittest/ams_app_life_cycle_test/BUILD.gn
View File

@ -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",
]
}

2
test/unittest/ams_app_running_record_test/BUILD.gn
View File

@ -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",
]
}

2
test/unittest/ams_app_workflow_test/BUILD.gn
View File

@ -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",
]
}

2
test/unittest/ams_recent_app_list_test/BUILD.gn
View File

@ -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",
]
}

2
test/unittest/ams_service_app_spawn_client_test/BUILD.gn
View File

@ -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"

2
test/unittest/ams_service_event_drive_test/BUILD.gn
View File

@ -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",
]
}

2
test/unittest/ams_service_load_ability_process_test/BUILD.gn
View File

@ -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",
]
}

2
test/unittest/ams_service_startup_test/BUILD.gn
View File

@ -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",
]
}

2
test/unittest/app_mgr_service_event_handler_test/BUILD.gn
View File

@ -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",
]
}

4
test/unittest/app_mgr_service_inner_test/BUILD.gn
View File

@ -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",
]
}

2
test/unittest/app_running_processes_info_test/BUILD.gn
View File

@ -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",
]
}