diff --git a/uhdf2/hcs/BUILD.gn b/uhdf2/hcs/BUILD.gn index 003d78b56748343a5c65d817565470ebb7274444..ff65e837c1422c03da3d25a0085f5987a88f579b 100644 --- a/uhdf2/hcs/BUILD.gn +++ b/uhdf2/hcs/BUILD.gn @@ -46,11 +46,7 @@ hc_gen_start_cfg("gen_start_cfg") { hcs_config_path = "//vendor/$product_company/$product_name/hdf_config/uhdf/" } sources = [ rebase_path(hcs_config_path + hcs_source) ] - if (use_musl) { - outputs = [ "$target_gen_dir/hdf_devhostmusl.cfg" ] - } else { - outputs = [ "$target_gen_dir/hdf_devhost.cfg" ] - } + outputs = [ "$target_gen_dir/hdf_devhost.cfg" ] } ohos_prebuilt_etc("hdf_devhost.cfg") { diff --git a/uhdf2/manager/BUILD.gn b/uhdf2/manager/BUILD.gn index 1b9d13998378c828c0c9c3585e0253cfe984b43c..d6ef7c0e3b2a57442a80bff6c9fb9a176345abc9 100644 --- a/uhdf2/manager/BUILD.gn +++ b/uhdf2/manager/BUILD.gn @@ -88,11 +88,7 @@ ohos_executable("hdf_devmgr") { } ohos_prebuilt_etc("hdf_devmgr.cfg") { - if (use_musl) { - source = "hdf_devmgrmusl.cfg" - } else { - source = "hdf_devmgr.cfg" - } + source = "hdf_devmgr.cfg" relative_install_dir = "init" install_images = [ chipset_base_dir ] subsystem_name = "hdf" diff --git a/uhdf2/manager/hdf_devmgr.cfg b/uhdf2/manager/hdf_devmgr.cfg index 05965056530354e6b5d98645334cea82fe7b90f6..89c79004e91420488a228a99e4017cb77720d4b5 100644 --- a/uhdf2/manager/hdf_devmgr.cfg +++ b/uhdf2/manager/hdf_devmgr.cfg @@ -2,10 +2,11 @@ "services" : [{ "name" : "hdf_devmgr", "path" : ["/vendor/bin/hdf_devmgr"], - "uid" : "root", - "gid" : ["system"], + "uid" : "hdf_devmgr", + "gid" : ["hdf_devmgr", "readproc"], + "start-mode" : "boot", "secon" : "u:r:hdf_devmgr:s0", - "start-mode" : "boot" + "caps" : ["DAC_OVERRIDE", "DAC_READ_SEARCH","CAP_SYS_MODULE", "CAP_SYS_RAWIO"] } ] } diff --git a/uhdf2/manager/hdf_devmgrmusl.cfg b/uhdf2/manager/hdf_devmgrmusl.cfg deleted file mode 100644 index 89c79004e91420488a228a99e4017cb77720d4b5..0000000000000000000000000000000000000000 --- a/uhdf2/manager/hdf_devmgrmusl.cfg +++ /dev/null @@ -1,12 +0,0 @@ -{ - "services" : [{ - "name" : "hdf_devmgr", - "path" : ["/vendor/bin/hdf_devmgr"], - "uid" : "hdf_devmgr", - "gid" : ["hdf_devmgr", "readproc"], - "start-mode" : "boot", - "secon" : "u:r:hdf_devmgr:s0", - "caps" : ["DAC_OVERRIDE", "DAC_READ_SEARCH","CAP_SYS_MODULE", "CAP_SYS_RAWIO"] - } - ] -}