openharmony/distributedschedule_samgr_lite
1
0
Fork 0
mirror of https://github.com/openharmony/distributedschedule_samgr_lite.git synced 2026-07-01 21:54:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

!97 modify samgr part-name

Browse Source 
Merge pull request !97 from huangxiaolinabc123/801
This commit is contained in:
openharmony_ci
2022-08-06 04:20:39 +00:00
committed by Gitee
parent 26c7c364bc 9005511d11
commit e6f2ac1afa
10 changed files with 59 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BUILD.gn
+5 -6
View File
@@ -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" ]
}
}
bundle.json
+5 -5
View File
@@ -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"
]
}
}
communication/broadcast/BUILD.gn
+4 -4
View File
@@ -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",
]
}
config.gni
+2 -2
View File
@@ -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
}
samgr/BUILD.gn
+13 -14
View File
@@ -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" ]
}
samgr/adapter/BUILD.gn
+1 -1
View File
@@ -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",
]
}
samgr/source/BUILD.gn
+5 -5
View File
@@ -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" ]
samgr_client/BUILD.gn
+7 -7
View File
@@ -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",
]
}
samgr_endpoint/BUILD.gn
+6 -6
View File
@@ -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",
]
samgr_server/BUILD.gn
+11 -11
View File
@@ -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",
]
}