From 4fbf58583688780b4afc9fcc459c8e1901b17a45 Mon Sep 17 00:00:00 2001 From: j30052480 Date: Tue, 19 Dec 2023 14:57:03 +0800 Subject: [PATCH 1/2] Decouple samgr from ability_base Signed-off-by: j30052480 --- services/samgr/var.gni | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/samgr/var.gni b/services/samgr/var.gni index 9a976c9d..bd5d779b 100644 --- a/services/samgr/var.gni +++ b/services/samgr/var.gni @@ -15,6 +15,7 @@ declare_args() { hicollie_able = true preferences_enable = true ressched_able = true + samgr_feature_ability_base_enable = true support_device_manager = false support_common_event = false if (!defined(global_parts_info) || @@ -34,7 +35,8 @@ declare_args() { support_device_manager = true } if (defined(global_parts_info) && - defined(global_parts_info.notification_common_event_service)) { + defined(global_parts_info.notification_common_event_service) && + defined(global_parts_info.ability_ability_base)) { support_common_event = true } if (defined(global_parts_info) && -- Gitee From 2282342d9b86f16a243efb5b0a9cd20e3d21562a Mon Sep 17 00:00:00 2001 From: j30052480 Date: Tue, 19 Dec 2023 15:00:09 +0800 Subject: [PATCH 2/2] Decouple samgr from ability_base Signed-off-by: j30052480 --- services/samgr/var.gni | 1 - 1 file changed, 1 deletion(-) diff --git a/services/samgr/var.gni b/services/samgr/var.gni index bd5d779b..8b3debf8 100644 --- a/services/samgr/var.gni +++ b/services/samgr/var.gni @@ -15,7 +15,6 @@ declare_args() { hicollie_able = true preferences_enable = true ressched_able = true - samgr_feature_ability_base_enable = true support_device_manager = false support_common_event = false if (!defined(global_parts_info) || -- Gitee