From 329d50917a32340a4fffc3250a4b14890d6cee28 Mon Sep 17 00:00:00 2001 From: huangxiaolinabc123 Date: Mon, 1 Aug 2022 09:36:05 +0800 Subject: [PATCH] modify samgr Signed-off-by: huangxiaolinabc123 Change-Id: I6fa665a2696b00e50a3d497417f8aebfc95c72c0 --- BUILD.gn | 11 +++++------ bundle.json | 10 +++++----- communication/broadcast/BUILD.gn | 8 ++++---- config.gni | 4 ++-- samgr/BUILD.gn | 27 +++++++++++++-------------- samgr/adapter/BUILD.gn | 2 +- samgr/source/BUILD.gn | 10 +++++----- samgr_client/BUILD.gn | 14 +++++++------- samgr_endpoint/BUILD.gn | 12 ++++++------ samgr_server/BUILD.gn | 22 +++++++++++----------- 10 files changed, 59 insertions(+), 61 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 3e84f90..636562c 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -27,7 +27,7 @@ lite_component("samgr") { ] } - if (enable_ohos_distributedschedule_samgr_lite_rpc_mini) { + if (enable_ohos_systemabilitymgr_samgr_lite_rpc_mini) { features += [ "samgr_server:server", "samgr_client:client", @@ -51,14 +51,13 @@ ndk_lib("samgr_lite_ndk") { "samgr", ] head_files = [ - "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/communication/broadcast", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/communication/broadcast", ] if (ohos_kernel_type == "liteos_a" || ohos_kernel_type == "linux") { deps += [ "samgr_server:server" ] - head_files += [ - "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", - ] + head_files += + [ "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry" ] } } diff --git a/bundle.json b/bundle.json index f139549..019313b 100644 --- a/bundle.json +++ b/bundle.json @@ -1,19 +1,19 @@ { - "name": "@ohos/distributedschedule_samgr_lite", + "name": "@ohos/systemabilitymgr_samgr_lite", "description": "system ability manager", "homePage": "https://gitee.com/openharmony", "version": "3.1", "license": "Apache License 2.0", - "repository": "https://gitee.com/openharmony/distributedschedule_samgr_lite", + "repository": "https://gitee.com/openharmony/systemabilitymgr_samgr_lite", "publishAs": "code-segment", "segment": { - "destPath": "foundation/distributedschedule/samgr_lite" + "destPath": "foundation/systemabilitymgr/samgr_lite" }, "dirs": {}, "scripts": {}, "component": { "name": "samgr_lite", - "subsystem": "distributedschedule", + "subsystem": "systemabilitymgr", "adapted_system_type": [ "small" ], @@ -36,7 +36,7 @@ }, "build": { "sub_component": [ - "//foundation/distributedschedule/samgr_lite:samgr" + "//foundation/systemabilitymgr/samgr_lite:samgr" ] } } diff --git a/communication/broadcast/BUILD.gn b/communication/broadcast/BUILD.gn index 12f060a..5fb815d 100755 --- a/communication/broadcast/BUILD.gn +++ b/communication/broadcast/BUILD.gn @@ -13,9 +13,9 @@ config("broadcast_public") { include_dirs = [ - "//foundation/distributedschedule/samgr_lite/interfaces/kits/communication/broadcast", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", - "//foundation/distributedschedule/samgr_lite/samgr/adapter", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/communication/broadcast", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", + "//foundation/systemabilitymgr/samgr_lite/samgr/adapter", "//utils/native/lite/include", ] } @@ -47,7 +47,7 @@ if (ohos_kernel_type == "liteos_a" || ohos_kernel_type == "linux") { ] include_dirs = [ "//third_party/bounds_checking_function/include" ] public_deps = [ - "//foundation/distributedschedule/samgr_lite/samgr:samgr", + "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", "//third_party/bounds_checking_function:libsec_shared", ] } diff --git a/config.gni b/config.gni index 3a017f3..66c0e21 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_distributedschedule_samgr_lite_shared_task_size = 2048 + config_ohos_systemabilitymgr_samgr_lite_shared_task_size = 2048 # enable samgr_lite adapt to rpc on mini system. - enable_ohos_distributedschedule_samgr_lite_rpc_mini = false + enable_ohos_systemabilitymgr_samgr_lite_rpc_mini = false } diff --git a/samgr/BUILD.gn b/samgr/BUILD.gn index 21fe370..25a76a5 100644 --- a/samgr/BUILD.gn +++ b/samgr/BUILD.gn @@ -15,9 +15,9 @@ import("../config.gni") defines = [] -if (defined(config_ohos_distributedschedule_samgr_lite_shared_task_size) && - config_ohos_distributedschedule_samgr_lite_shared_task_size > 0) { - defines += [ "SHARED_TASK_STACK_SIZE=$config_ohos_distributedschedule_samgr_lite_shared_task_size" ] +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" ] } config("external_settings_shared") { @@ -28,8 +28,8 @@ config("samgr_public") { include_dirs = [ "adapter", "registry", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", "//utils/native/lite/include", ] } @@ -47,15 +47,14 @@ if (ohos_kernel_type == "liteos_m") { [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite" ] public_deps = [ - "//foundation/distributedschedule/samgr_lite/samgr/adapter:samgr_adapter", - "//foundation/distributedschedule/samgr_lite/samgr/source:samgr_source", + "//foundation/systemabilitymgr/samgr_lite/samgr/adapter:samgr_adapter", + "//foundation/systemabilitymgr/samgr_lite/samgr/source:samgr_source", ] - if (enable_ohos_distributedschedule_samgr_lite_rpc_mini) { + if (enable_ohos_systemabilitymgr_samgr_lite_rpc_mini) { defines += [ "MINI_SAMGR_LITE_RPC" ] - include_dirs += [ - "//foundation/distributedschedule/samgr_lite/samgr_endpoint/source", - ] + include_dirs += + [ "//foundation/systemabilitymgr/samgr_lite/samgr_endpoint/source" ] public_deps += [ "//foundation/communication/ipc/interfaces/innerkits/c/dbinder:dbinder", ] @@ -77,14 +76,14 @@ if (ohos_kernel_type == "liteos_a" || ohos_kernel_type == "linux") { include_dirs = [ "//third_party/bounds_checking_function/include", "//third_party/cJSON", - "//foundation/distributedschedule/samgr_lite/samgr_endpoint/source", + "//foundation/systemabilitymgr/samgr_lite/samgr_endpoint/source", ] public_deps = [ "//build/lite/config/component/cJSON:cjson_shared", "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", - "//foundation/distributedschedule/samgr_lite/samgr/source:samgr_source", - "//foundation/distributedschedule/samgr_lite/samgr_client:client", + "//foundation/systemabilitymgr/samgr_lite/samgr/source:samgr_source", + "//foundation/systemabilitymgr/samgr_lite/samgr_client:client", ] public_configs += [ ":external_settings_shared" ] } diff --git a/samgr/adapter/BUILD.gn b/samgr/adapter/BUILD.gn index 422d52c..88fd85e 100755 --- a/samgr/adapter/BUILD.gn +++ b/samgr/adapter/BUILD.gn @@ -14,7 +14,7 @@ config("samgr_adapter_public") { include_dirs = [ "./", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", "//utils/native/lite/include", ] } diff --git a/samgr/source/BUILD.gn b/samgr/source/BUILD.gn index 56f759e..01d219d 100755 --- a/samgr/source/BUILD.gn +++ b/samgr/source/BUILD.gn @@ -17,8 +17,8 @@ config("samgr_source_public") { include_dirs = [ "../adapter", "../registry", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", "//utils/native/lite/include", ] } @@ -37,13 +37,13 @@ if (ohos_kernel_type == "liteos_m") { public_configs = [ ":samgr_source_public" ] public_deps = [ - "//foundation/distributedschedule/samgr_lite/samgr/adapter:samgr_adapter", + "//foundation/systemabilitymgr/samgr_lite/samgr/adapter:samgr_adapter", ] include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite" ] - if (enable_ohos_distributedschedule_samgr_lite_rpc_mini) { + if (enable_ohos_systemabilitymgr_samgr_lite_rpc_mini) { public_deps += [ "//foundation/communication/ipc/interfaces/innerkits/c/dbinder:dbinder", ] @@ -71,7 +71,7 @@ if (ohos_kernel_type == "liteos_a" || ohos_kernel_type == "linux") { public_deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/distributedschedule/samgr_lite/samgr/adapter:samgr_adapter", + "//foundation/systemabilitymgr/samgr_lite/samgr/adapter:samgr_adapter", ] include_dirs = [ "//third_party/bounds_checking_function/include" ] diff --git a/samgr_client/BUILD.gn b/samgr_client/BUILD.gn index 112df79..7bb134d 100644 --- a/samgr_client/BUILD.gn +++ b/samgr_client/BUILD.gn @@ -13,7 +13,7 @@ import("../config.gni") -if (!enable_ohos_distributedschedule_samgr_lite_rpc_mini) { +if (!enable_ohos_systemabilitymgr_samgr_lite_rpc_mini) { source_set("client") { sources = [ "source/remote_register_rpc.c" ] @@ -24,15 +24,15 @@ if (!enable_ohos_distributedschedule_samgr_lite_rpc_mini) { include_dirs = [ "../samgr_endpoint/source", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", "//utils/native/lite/include", "//third_party/bounds_checking_function/include", ] public_deps = [ "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", - "//foundation/distributedschedule/samgr_lite/samgr_endpoint:endpoint_source", + "//foundation/systemabilitymgr/samgr_lite/samgr_endpoint:endpoint_source", "//third_party/bounds_checking_function:libsec_shared", ] } @@ -44,15 +44,15 @@ if (!enable_ohos_distributedschedule_samgr_lite_rpc_mini) { include_dirs = [ "../samgr_server/source", "../samgr_endpoint/source", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", "//utils/native/lite/include", "//third_party/bounds_checking_function/include", ] public_deps = [ "//foundation/communication/ipc/interfaces/innerkits/c/dbinder:dbinder", - "//foundation/distributedschedule/samgr_lite/samgr_endpoint:endpoint_source", + "//foundation/systemabilitymgr/samgr_lite/samgr_endpoint:endpoint_source", "//third_party/bounds_checking_function:libsec_static", ] } diff --git a/samgr_endpoint/BUILD.gn b/samgr_endpoint/BUILD.gn index 6872d09..4fdeb60 100644 --- a/samgr_endpoint/BUILD.gn +++ b/samgr_endpoint/BUILD.gn @@ -13,12 +13,12 @@ import("../config.gni") -if (!enable_ohos_distributedschedule_samgr_lite_rpc_mini) { +if (!enable_ohos_systemabilitymgr_samgr_lite_rpc_mini) { config("endpoint_public") { include_dirs = [ "../samgr/adapter", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", "//utils/native/lite/include", "//third_party/bounds_checking_function/include", "//base/security/permission_lite/services/ipc_auth/include", @@ -87,8 +87,8 @@ if (!enable_ohos_distributedschedule_samgr_lite_rpc_mini) { config("endpoint_public") { include_dirs = [ "../samgr/adapter", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", "//utils/native/lite/include", "//third_party/bounds_checking_function/include", "//base/security/permission_lite/services/ipc_auth/include", @@ -99,7 +99,7 @@ if (!enable_ohos_distributedschedule_samgr_lite_rpc_mini) { include_dirs = [ "./source", "../samgr/registry", - "//foundation/distributedschedule/samgr_lite/samgr_server/source", + "//foundation/systemabilitymgr/samgr_lite/samgr_server/source", "//base/security/permission_lite/interfaces/innerkits", "//base/security/permission_lite/services/pms_base/include", ] diff --git a/samgr_server/BUILD.gn b/samgr_server/BUILD.gn index 5cec046..3acc37a 100644 --- a/samgr_server/BUILD.gn +++ b/samgr_server/BUILD.gn @@ -13,7 +13,7 @@ import("../config.gni") -if (!enable_ohos_distributedschedule_samgr_lite_rpc_mini) { +if (!enable_ohos_systemabilitymgr_samgr_lite_rpc_mini) { shared_library("server") { sources = [ "source/samgr_server_rpc.c" ] @@ -25,20 +25,20 @@ if (!enable_ohos_distributedschedule_samgr_lite_rpc_mini) { include_dirs = [ "../samgr_endpoint/source", "//base/security/permission_lite/interfaces/innerkits", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", "//utils/native/lite/include", "//third_party/cJSON", "//third_party/bounds_checking_function/include", "//base/security/permission_lite/services/pms_base/include", ] - deps = [ "//foundation/distributedschedule/samgr_lite:ConfigFiles" ] + deps = [ "//foundation/systemabilitymgr/samgr_lite:ConfigFiles" ] public_deps = [ "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", - "//foundation/distributedschedule/samgr_lite/samgr:samgr", - "//foundation/distributedschedule/samgr_lite/samgr_endpoint:store_source", + "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", + "//foundation/systemabilitymgr/samgr_lite/samgr_endpoint:store_source", "//third_party/bounds_checking_function:libsec_shared", ] } @@ -50,19 +50,19 @@ if (!enable_ohos_distributedschedule_samgr_lite_rpc_mini) { include_dirs = [ "../samgr_endpoint/source", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry", "//utils/native/lite/include", "//third_party/bounds_checking_function/include", ] - deps = [ "//foundation/distributedschedule/samgr_lite:ConfigFiles" ] + deps = [ "//foundation/systemabilitymgr/samgr_lite:ConfigFiles" ] public_deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_static", "//foundation/communication/ipc/interfaces/innerkits/c/dbinder:dbinder", - "//foundation/distributedschedule/samgr_lite/samgr:samgr", - "//foundation/distributedschedule/samgr_lite/samgr_endpoint:store_source", + "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", + "//foundation/systemabilitymgr/samgr_lite/samgr_endpoint:store_source", "//third_party/bounds_checking_function:libsec_static", ] } -- Gitee