memmgr_client部件依赖修改

Signed-off-by: zhangyuhang72 <zhangyuhang72@huawei.com>
Change-Id: Idfed187e113ad73c445e4766f06a3b790ad8f135
This commit is contained in:
zhangyuhang72 2024-04-03 10:04:58 +08:00
parent 0e427e4fe1
commit 5f45bd679f
12 changed files with 78 additions and 11 deletions

View File

@ -89,6 +89,8 @@ declare_args() {
"com.ohos.passwordbox/entry/AutoFillAbility"
ability_runtime_smart_auto_fill_ability =
"com.ohos.textautofill/entry/TextAutoFillAbility"
ability_runtime_use_memmgr_plugin = false
ability_runtime_use_memmgr = false
if (!defined(global_parts_info) ||
defined(global_parts_info.account_os_account)) {
@ -112,6 +114,16 @@ declare_args() {
efficiency_manager = false
}
if (defined(global_parts_info) &&
defined(global_parts_info.resourceschedule_memmgr_plugin)) {
ability_runtime_use_memmgr_plugin = true
}
if (defined(global_parts_info) &&
defined(global_parts_info.resourceschedule_memmgr)) {
ability_runtime_use_memmgr = true
}
if (defined(global_parts_info) &&
!defined(global_parts_info.distributeddatamgr_relational_store)) {
ability_runtime_relational = false

View File

@ -115,7 +115,6 @@ ohos_shared_library("libappms") {
"ipc:ipc_core",
"kv_store:distributeddata_inner",
"kv_store:distributeddata_mgr",
"memmgr:memmgrclient",
"memory_utils:libmeminfo",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
@ -140,6 +139,12 @@ ohos_shared_library("libappms") {
external_deps += [ "efficiency_manager:suspend_manager_client" ]
}
if (ability_runtime_use_memmgr_plugin) {
external_deps += [ "memmgr_plugin:memmgrclient" ]
} else if (ability_runtime_use_memmgr) {
external_deps += [ "memmgr:memmgrclient" ]
}
if (background_task_mgr_continuous_task_enable) {
defines += [ "BGTASKMGR_CONTINUOUS_TASK_ENABLE" ]
}

View File

@ -77,13 +77,18 @@ ohos_unittest("AmsAbilityRunningRecordTest") {
"init:libbeget_proxy",
"ipc:ipc_core",
"kv_store:distributeddata_inner",
"memmgr:memmgrclient",
"memory_utils:libmeminfo",
]
if (ability_runtime_graphics) {
external_deps += [ "window_manager:libwm" ]
}
if (ability_runtime_use_memmgr_plugin) {
external_deps += [ "memmgr_plugin:memmgrclient" ]
} else if (ability_runtime_use_memmgr) {
external_deps += [ "memmgr:memmgrclient" ]
}
}
group("unittest") {

View File

@ -73,9 +73,14 @@ ohos_unittest("AmsAppLifeCycleTest") {
"init:libbeget_proxy",
"ipc:ipc_core",
"kv_store:distributeddata_inner",
"memmgr:memmgrclient",
"memory_utils:libmeminfo",
]
if (ability_runtime_use_memmgr_plugin) {
external_deps += [ "memmgr_plugin:memmgrclient" ]
} else if (ability_runtime_use_memmgr) {
external_deps += [ "memmgr:memmgrclient" ]
}
}
group("unittest") {

View File

@ -72,7 +72,6 @@ ohos_unittest("AmsWorkFlowTest") {
"init:libbeget_proxy",
"ipc:ipc_core",
"kv_store:distributeddata_inner",
"memmgr:memmgrclient",
"memory_utils:libmeminfo",
]
@ -82,6 +81,12 @@ ohos_unittest("AmsWorkFlowTest") {
"window_manager:libwsutils",
]
}
if (ability_runtime_use_memmgr_plugin) {
external_deps += [ "memmgr_plugin:memmgrclient" ]
} else if (ability_runtime_use_memmgr) {
external_deps += [ "memmgr:memmgrclient" ]
}
}
group("unittest") {

View File

@ -87,7 +87,6 @@ ohos_unittest("AmsRecentAppListTest") {
"init:libbeget_proxy",
"ipc:ipc_core",
"kv_store:distributeddata_inner",
"memmgr:memmgrclient",
"memory_utils:libmeminfo",
]
@ -97,6 +96,12 @@ ohos_unittest("AmsRecentAppListTest") {
"window_manager:libwsutils",
]
}
if (ability_runtime_use_memmgr_plugin) {
external_deps += [ "memmgr_plugin:memmgrclient" ]
} else if (ability_runtime_use_memmgr) {
external_deps += [ "memmgr:memmgrclient" ]
}
}
group("unittest") {

View File

@ -83,7 +83,6 @@ ohos_unittest("AmsServiceAppSpawnClientTest") {
"init:libbeget_proxy",
"ipc:ipc_core",
"kv_store:distributeddata_inner",
"memmgr:memmgrclient",
"memory_utils:libmeminfo",
]
@ -91,6 +90,12 @@ ohos_unittest("AmsServiceAppSpawnClientTest") {
external_deps += [ "window_manager:libwm" ]
}
if (ability_runtime_use_memmgr_plugin) {
external_deps += [ "memmgr_plugin:memmgrclient" ]
} else if (ability_runtime_use_memmgr) {
external_deps += [ "memmgr:memmgrclient" ]
}
subsystem_name = "ability"
part_name = "ability_runtime"
}

View File

@ -87,10 +87,15 @@ ohos_unittest("AmsServiceEventDriveTest") {
"init:libbeget_proxy",
"ipc:ipc_core",
"kv_store:distributeddata_inner",
"memmgr:memmgrclient",
"memory_utils:libmeminfo",
]
if (ability_runtime_use_memmgr_plugin) {
external_deps += [ "memmgr_plugin:memmgrclient" ]
} else if (ability_runtime_use_memmgr) {
external_deps += [ "memmgr:memmgrclient" ]
}
if (ability_runtime_graphics) {
external_deps += [ "window_manager:libwm" ]
}

View File

@ -89,7 +89,6 @@ ohos_unittest("AmsServiceLoadAbilityProcessTest") {
"init:libbeget_proxy",
"ipc:ipc_core",
"kv_store:distributeddata_inner",
"memmgr:memmgrclient",
"memory_utils:libmeminfo",
]
@ -99,6 +98,12 @@ ohos_unittest("AmsServiceLoadAbilityProcessTest") {
"window_manager:libwsutils",
]
}
if (ability_runtime_use_memmgr_plugin) {
external_deps += [ "memmgr_plugin:memmgrclient" ]
} else if (ability_runtime_use_memmgr) {
external_deps += [ "memmgr:memmgrclient" ]
}
}
group("unittest") {

View File

@ -83,13 +83,18 @@ ohos_unittest("AmsServiceStartupTest") {
"init:libbeget_proxy",
"ipc:ipc_core",
"kv_store:distributeddata_inner",
"memmgr:memmgrclient",
"memory_utils:libmeminfo",
]
if (ability_runtime_graphics) {
external_deps += [ "window_manager:libwm" ]
}
if (ability_runtime_use_memmgr_plugin) {
external_deps += [ "memmgr_plugin:memmgrclient" ]
} else if (ability_runtime_use_memmgr) {
external_deps += [ "memmgr:memmgrclient" ]
}
}
group("unittest") {

View File

@ -84,7 +84,6 @@ ohos_unittest("AMSEventHandlerTest") {
"init:libbeget_proxy",
"ipc:ipc_core",
"kv_store:distributeddata_inner",
"memmgr:memmgrclient",
"memory_utils:libmeminfo",
]
@ -94,6 +93,12 @@ ohos_unittest("AMSEventHandlerTest") {
"window_manager:libwsutils",
]
}
if (ability_runtime_use_memmgr_plugin) {
external_deps += [ "memmgr_plugin:memmgrclient" ]
} else if (ability_runtime_use_memmgr) {
external_deps += [ "memmgr:memmgrclient" ]
}
}
group("unittest") {

View File

@ -80,13 +80,18 @@ ohos_unittest("AppRunningProcessesInfoTest") {
"init:libbeget_proxy",
"ipc:ipc_core",
"kv_store:distributeddata_inner",
"memmgr:memmgrclient",
"memory_utils:libmeminfo",
]
if (ability_runtime_graphics) {
external_deps += [ "window_manager:libwm" ]
}
if (ability_runtime_use_memmgr_plugin) {
external_deps += [ "memmgr_plugin:memmgrclient" ]
} else if (ability_runtime_use_memmgr) {
external_deps += [ "memmgr:memmgrclient" ]
}
}
group("unittest") {