From a3b87cc98fb16b86015aaedf103c143d3e3dff4c Mon Sep 17 00:00:00 2001 From: huangjiabao Date: Fri, 31 May 2024 14:15:26 +0800 Subject: [PATCH 1/4] commit msg Signed-off-by: huangjiabao --- bundle.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bundle.json b/bundle.json index 2a974a3..9f2c65c 100644 --- a/bundle.json +++ b/bundle.json @@ -18,6 +18,10 @@ "adapted_system_type": [ "small" ], + "features":[ + "config_ohos_systemabilitymgr_samgr_lite_shared_task_size = 2048", + "enable_ohos_systemabilitymgr_samgr_lite_rpc_mini = false" + ], "adapted_kernel": [ "liteos_a", "liteos_m", -- Gitee From 1ea2dd85100598ad2b1110a7497dd2ad317d9bbf Mon Sep 17 00:00:00 2001 From: huangjiabao Date: Fri, 31 May 2024 14:52:29 +0800 Subject: [PATCH 2/4] commit msg Signed-off-by: huangjiabao --- bundle.json | 1 - 1 file changed, 1 deletion(-) diff --git a/bundle.json b/bundle.json index 9f2c65c..b8ef5e7 100644 --- a/bundle.json +++ b/bundle.json @@ -19,7 +19,6 @@ "small" ], "features":[ - "config_ohos_systemabilitymgr_samgr_lite_shared_task_size = 2048", "enable_ohos_systemabilitymgr_samgr_lite_rpc_mini = false" ], "adapted_kernel": [ -- Gitee From 8fff84e33b3c6e67c2a117e42186e5290ff96bc5 Mon Sep 17 00:00:00 2001 From: huangjiabao Date: Tue, 4 Jun 2024 19:06:48 +0800 Subject: [PATCH 3/4] commit msg Signed-off-by: huangjiabao --- BUILD.gn | 2 +- bundle.json | 3 ++- samgr/BUILD.gn | 8 ++++---- samgr/source/BUILD.gn | 2 +- samgr_client/BUILD.gn | 2 +- samgr_endpoint/BUILD.gn | 2 +- samgr_server/BUILD.gn | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index d64ad05..30a4bde 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -27,7 +27,7 @@ lite_component("samgr") { ] } - if (enable_ohos_systemabilitymgr_samgr_lite_rpc_mini) { + if (samgr_lite_enable_ohos_systemabilitymgr_rpc_mini) { features += [ "samgr_server:server", "samgr_client:client", diff --git a/bundle.json b/bundle.json index b8ef5e7..72cecdd 100644 --- a/bundle.json +++ b/bundle.json @@ -19,7 +19,8 @@ "small" ], "features":[ - "enable_ohos_systemabilitymgr_samgr_lite_rpc_mini = false" + "samgr_lite_enable_ohos_systemabilitymgr_rpc_mini = false", + "samgr_lite_config_ohos_systemabilitymgr_shared_task_size = 2048" ], "adapted_kernel": [ "liteos_a", diff --git a/samgr/BUILD.gn b/samgr/BUILD.gn index 9945161..807a67e 100644 --- a/samgr/BUILD.gn +++ b/samgr/BUILD.gn @@ -15,9 +15,9 @@ import("../config.gni") defines = [] -if (defined(config_ohos_systemabilitymgr_samgr_lite_shared_task_size) && - config_ohos_systemabilitymgr_samgr_lite_shared_task_size > 0) { - defines += [ "SHARED_TASK_STACK_SIZE=$config_ohos_systemabilitymgr_samgr_lite_shared_task_size" ] +if (defined(samgr_lite_config_ohos_systemabilitymgr_shared_task_size) && + samgr_lite_config_ohos_systemabilitymgr_shared_task_size > 0) { + defines += [ "SHARED_TASK_STACK_SIZE=$samgr_lite_config_ohos_systemabilitymgr_shared_task_size" ] } config("external_settings_shared") { @@ -51,7 +51,7 @@ if (ohos_kernel_type == "liteos_m" || ohos_kernel_type == "uniproton") { "//foundation/systemabilitymgr/samgr_lite/samgr/source:samgr_source", ] - if (enable_ohos_systemabilitymgr_samgr_lite_rpc_mini) { + if (samgr_lite_enable_ohos_systemabilitymgr_rpc_mini) { defines += [ "MINI_SAMGR_LITE_RPC" ] include_dirs += [ "//foundation/systemabilitymgr/samgr_lite/samgr_endpoint/source" ] diff --git a/samgr/source/BUILD.gn b/samgr/source/BUILD.gn index 4b81e2d..067d9a9 100644 --- a/samgr/source/BUILD.gn +++ b/samgr/source/BUILD.gn @@ -43,7 +43,7 @@ if (ohos_kernel_type == "liteos_m" || ohos_kernel_type == "uniproton") { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite" ] - if (enable_ohos_systemabilitymgr_samgr_lite_rpc_mini) { + if (samgr_lite_enable_ohos_systemabilitymgr_rpc_mini) { public_deps += [ "//foundation/communication/ipc/interfaces/innerkits/c/dbinder:dbinder", ] diff --git a/samgr_client/BUILD.gn b/samgr_client/BUILD.gn index 95c1ce1..0c0c8e7 100644 --- a/samgr_client/BUILD.gn +++ b/samgr_client/BUILD.gn @@ -13,7 +13,7 @@ import("../config.gni") -if (!enable_ohos_systemabilitymgr_samgr_lite_rpc_mini) { +if (!samgr_lite_enable_ohos_systemabilitymgr_rpc_mini) { source_set("client") { sources = [ "source/remote_register_rpc.c" ] diff --git a/samgr_endpoint/BUILD.gn b/samgr_endpoint/BUILD.gn index beb2cc1..e8baa3f 100644 --- a/samgr_endpoint/BUILD.gn +++ b/samgr_endpoint/BUILD.gn @@ -13,7 +13,7 @@ import("../config.gni") -if (!enable_ohos_systemabilitymgr_samgr_lite_rpc_mini) { +if (!samgr_lite_enable_ohos_systemabilitymgr_rpc_mini) { config("endpoint_public") { include_dirs = [ "../samgr/adapter", diff --git a/samgr_server/BUILD.gn b/samgr_server/BUILD.gn index 1a965df..f103e17 100644 --- a/samgr_server/BUILD.gn +++ b/samgr_server/BUILD.gn @@ -13,7 +13,7 @@ import("../config.gni") -if (!enable_ohos_systemabilitymgr_samgr_lite_rpc_mini) { +if (!samgr_lite_enable_ohos_systemabilitymgr_rpc_mini) { shared_library("server") { sources = [ "source/samgr_server_rpc.c" ] -- Gitee From 28ad4b232e22a2f02e12afd5ce6ad9ed1fa31c8b Mon Sep 17 00:00:00 2001 From: huangjiabao Date: Wed, 5 Jun 2024 16:57:26 +0800 Subject: [PATCH 4/4] commit msg Signed-off-by: huangjiabao --- config.gni | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.gni b/config.gni index 66c0e21..1616b24 100644 --- a/config.gni +++ b/config.gni @@ -14,8 +14,8 @@ declare_args() { # configuration for samgr_lite created shared task's stack size. # 0 means using system default thread stack size, other positive values will be accepted. - config_ohos_systemabilitymgr_samgr_lite_shared_task_size = 2048 + samgr_lite_config_ohos_systemabilitymgr_shared_task_size = 2048 # enable samgr_lite adapt to rpc on mini system. - enable_ohos_systemabilitymgr_samgr_lite_rpc_mini = false + samgr_lite_enable_ohos_systemabilitymgr_rpc_mini = false } -- Gitee