From 2531f17e32a729b4c6db453ab1abaffd2f79e0b0 Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Sat, 31 Jul 2021 15:11:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?L2=E6=B7=BB=E5=8A=A0config=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zuojiangjiang --- services/distributeddataservice/app/BUILD.gn | 16 +++++++++++++- .../app/distributed_data.cfg | 22 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 services/distributeddataservice/app/distributed_data.cfg diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn index 5129944cd..a25a7a046 100755 --- a/services/distributeddataservice/app/BUILD.gn +++ b/services/distributeddataservice/app/BUILD.gn @@ -17,12 +17,26 @@ group("build_module") { deps = [ ":distributeddataservice" ] if (build_public_version) { deps += [ - ":distributed_data.rc", ":distributeddata_profile", ] + if (use_musl) { + deps += [ + ":distributed_data.cfg", + ] + } else { + deps += [ + ":distributed_data.rc", + ] + } } } +ohos_prebuilt_etc("distributed_data.cfg") { + source = "distributed_data.cfg" + relative_install_dir = "init" + subsystem_name = "distributeddatamgr" +} + ohos_prebuilt_etc("distributed_data.rc") { source = "distributed_data.rc" relative_install_dir = "init" diff --git a/services/distributeddataservice/app/distributed_data.cfg b/services/distributeddataservice/app/distributed_data.cfg new file mode 100644 index 000000000..232266d06 --- /dev/null +++ b/services/distributeddataservice/app/distributed_data.cfg @@ -0,0 +1,22 @@ +{ + "jobs":[{ + "name" : "boot", + "cmds" : [ + "start distributeddata" + ] + } + ], + "services":[{ + "name" : "distributeddata", + "path" : ["/system/bin/sa_main","/system/profile/distributeddata.xml"], + "caps" : ["DAC_READ_SEARCH"], + "uid" : "system", + "gid" : ["system","shell","readproc"], + "writepid":[ + "/dev/cpuset/foreground/tasks", + "/dev/stune/foreground/tasks", + "/dev/blkio/foreground/tasks" + ] + } + ] +} \ No newline at end of file -- Gitee From a53a23e576a72e4c806b8edf384e16bb2f103a17 Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Sat, 31 Jul 2021 15:34:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0license=20Signed-off-by:?= =?UTF-8?q?=20zuojiangjiang=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distributeddataservice/app/distributed_data.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/services/distributeddataservice/app/distributed_data.cfg b/services/distributeddataservice/app/distributed_data.cfg index 232266d06..dc32ef348 100644 --- a/services/distributeddataservice/app/distributed_data.cfg +++ b/services/distributeddataservice/app/distributed_data.cfg @@ -1,3 +1,15 @@ +# Copyright (c) 2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. { "jobs":[{ "name" : "boot", -- Gitee From b0540f7a6ac5ba722c7fe51138fe9ffcb5bccea5 Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Sat, 31 Jul 2021 16:07:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=96=E6=B6=88cpoyright=20Signed-off-by?= =?UTF-8?q?:=20zuojiangjiang=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distributeddataservice/app/distributed_data.cfg | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/services/distributeddataservice/app/distributed_data.cfg b/services/distributeddataservice/app/distributed_data.cfg index dc32ef348..232266d06 100644 --- a/services/distributeddataservice/app/distributed_data.cfg +++ b/services/distributeddataservice/app/distributed_data.cfg @@ -1,15 +1,3 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. { "jobs":[{ "name" : "boot", -- Gitee