diff --git a/BUILD.gn b/BUILD.gn index d64ad0584bfb5f2804e54d72e95d4b37536a256a..30a4bde6b182ce16218c1a7a5ca63e2bad2f24c4 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 2a974a38d045dc0b3a239f9451b6b30d028a6e44..72cecdd418ed978c7bfc0effacb6005ae3fb91c6 100644 --- a/bundle.json +++ b/bundle.json @@ -18,6 +18,10 @@ "adapted_system_type": [ "small" ], + "features":[ + "samgr_lite_enable_ohos_systemabilitymgr_rpc_mini = false", + "samgr_lite_config_ohos_systemabilitymgr_shared_task_size = 2048" + ], "adapted_kernel": [ "liteos_a", "liteos_m", diff --git a/config.gni b/config.gni index 66c0e219f83a7364766bc286f60feedbf3650fc1..1616b24b69c41a0276b60413db910fbbbef5a9de 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 } diff --git a/samgr/BUILD.gn b/samgr/BUILD.gn index 9945161e0bab7479d123e9706c469f4b67b987c6..807a67ead487691f806a622ecbc87cce48fe7242 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 4b81e2d3375c9db293b3cfefa7bcf0654d630448..067d9a97502dd89c72c619b2da178001508a15a0 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 95c1ce116664025b3dada5d87907663f4980d4fb..0c0c8e731b701663d6192fb9e28b1d75c32a1fe0 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 beb2cc155f35ba7f807609b4665671358696b165..e8baa3f4e4734b15528fc8a604902e6c4dc6eb1b 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 1a965dfb3d932f17db61a00f43bcddf8ac38ca1f..f103e17f60db937fd85ac52b600f47eefcf69cfe 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" ]