From 1786b8e4f47a9328153132c02bbfa749e13b89de Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Sat, 31 Jul 2021 06:10:23 +0000 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 --- 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..a981460ae --- /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 e592e1a6db32519177a3d8ee23cc86d389e03601 Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Sat, 31 Jul 2021 06:58:53 +0000 Subject: [PATCH 2/3] L2 --- services/distributeddataservice/app/BUILD.gn | 16 +------------- .../app/distributed_data.cfg | 22 ------------------- 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn index a25a7a046..f6b5cc52a 100755 --- a/services/distributeddataservice/app/BUILD.gn +++ b/services/distributeddataservice/app/BUILD.gn @@ -18,25 +18,11 @@ group("build_module") { if (build_public_version) { deps += [ ":distributeddata_profile", + ":distributed_data.rc", ] - 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 index a981460ae..e69de29bb 100644 --- a/services/distributeddataservice/app/distributed_data.cfg +++ b/services/distributeddataservice/app/distributed_data.cfg @@ -1,22 +0,0 @@ -{ - "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 f46803c4c568a2ebd4098002f591f32698459ee1 Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Sat, 31 Jul 2021 15:01:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?L2=E6=B7=BB=E5=8A=A0congif=E6=96=87?= =?UTF-8?q?=E4=BB=B6=20Signed-off-by:=20zuojiangjiang=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/distributeddataservice/app/BUILD.gn | 16 +++++++++++++- .../app/distributed_data.cfg | 22 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn index f6b5cc52a..a25a7a046 100755 --- a/services/distributeddataservice/app/BUILD.gn +++ b/services/distributeddataservice/app/BUILD.gn @@ -18,11 +18,25 @@ group("build_module") { if (build_public_version) { deps += [ ":distributeddata_profile", - ":distributed_data.rc", ] + 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 index e69de29bb..232266d06 100644 --- a/services/distributeddataservice/app/distributed_data.cfg +++ 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