diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2020-04-15 13:56:36 +0530 |
|---|---|---|
| committer | Todd Kjos <tkjos@google.com> | 2020-04-25 15:24:16 +0000 |
| commit | 2cf92a4173d774ad491709f80fe8fe3aa1698e6a (patch) | |
| tree | 7e7b576d054f5f59a77fca1b09e4c7700004606d | |
| parent | bf70b7d649e7d705042b007dfc22fc788fc2f1d4 (diff) | |
qcom: qrtr: Disable qrtr-ns and qrtr-cfg
No need to run qrtr-ns and qrtr-cfg services
explicitly. They are moved to kernel now
starting from v5.7-rc1.
We are keeping qrtr-lookup around for debugging.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Change-Id: I02d72e73ef3d64fed1c024a97cec3560241aff22
| -rw-r--r-- | db845c/device.mk | 3 | ||||
| -rw-r--r-- | qcom/init.qcom.rc | 13 | ||||
| -rw-r--r-- | sepolicy/file_contexts | 3 | ||||
| -rw-r--r-- | sepolicy/qrtr.te | 8 |
4 files changed, 2 insertions, 25 deletions
diff --git a/db845c/device.mk b/db845c/device.mk index b37e06f..23299ad 100644 --- a/db845c/device.mk +++ b/db845c/device.mk @@ -32,10 +32,9 @@ PRODUCT_COPY_FILES := \ # Build generic Audio HAL PRODUCT_PACKAGES := audio.primary.db845c +# Build and install Qcom userspace tools to talk to dsp and modem PRODUCT_PACKAGES += \ pd-mapper \ - qrtr-ns \ - qrtr-cfg \ qrtr-lookup \ rmtfs \ tqftpserv diff --git a/qcom/init.qcom.rc b/qcom/init.qcom.rc index 303fc9a..6325127 100644 --- a/qcom/init.qcom.rc +++ b/qcom/init.qcom.rc @@ -1,10 +1,3 @@ -service qrtr-ns /vendor/bin/qrtr-ns -f 1 - class core - user root - group system - disabled - oneshot - service pd_mapper /vendor/bin/pd-mapper class core user root @@ -26,11 +19,6 @@ service rmtfs /vendor/bin/rmtfs -o /dev/block/platform/soc@0/1d84000.ufshc/by-na disabled oneshot -on early-init - exec - root -- /vendor/bin/qrtr-cfg 1 - start qrtr-ns - start pd_mapper - on post-fs-data mkdir /data/vendor mkdir /data/vendor/tmp @@ -39,5 +27,6 @@ on post-fs-data mkdir /data/vendor/readonly/firmware mkdir /data/vendor/readonly/firmware/image write /sys/class/firmware/timeout 1 + start pd_mapper start tqftpserv start rmtfs diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 247e1ab..532b1c9 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -33,8 +33,6 @@ /vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.software u:object_r:hal_gatekeeper_default_exec:s0 /vendor/bin/pd-mapper u:object_r:pd_mapper_exec:s0 -/vendor/bin/qrtr-cfg u:object_r:qrtr_exec:s0 -/vendor/bin/qrtr-ns u:object_r:qrtr_exec:s0 /vendor/bin/rmtfs u:object_r:rmtfs_exec:s0 /vendor/bin/tqftpserv u:object_r:tqftpserv_exec:s0 @@ -44,4 +42,3 @@ /vendor/lib(64)?/libdrm_freedreno\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/libgbm\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/libglapi\.so u:object_r:same_process_hal_file:s0 -/vendor/lib(64)?/libqrtr\.so u:object_r:same_process_hal_file:s0 diff --git a/sepolicy/qrtr.te b/sepolicy/qrtr.te deleted file mode 100644 index 8344398..0000000 --- a/sepolicy/qrtr.te +++ /dev/null @@ -1,8 +0,0 @@ -type qrtr, domain; -type qrtr_exec, exec_type, vendor_file_type, file_type; -init_daemon_domain(qrtr) - -allow qrtr self:capability net_admin; -allow qrtr self:capability sys_admin; -allow qrtr self:qipcrtr_socket create_socket_perms_no_ioctl; -allow qrtr self:netlink_route_socket { create nlmsg_write read write }; |