Revert "qcom: qrtr: Disable qrtr-ns and qrtr-cfg" am: ac5ab76ae1 am: 7f5dc700c7
Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1359342
Change-Id: Ia85b6f41af2746d4ba682ab08cdc8b614922d3b6
diff --git a/db845c/device.mk b/db845c/device.mk
index 23299ad..b37e06f 100644
--- a/db845c/device.mk
+++ b/db845c/device.mk
@@ -32,9 +32,10 @@
# 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 ba4f24c..94e9038 100644
--- a/qcom/init.qcom.rc
+++ b/qcom/init.qcom.rc
@@ -1,3 +1,10 @@
+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
@@ -19,6 +26,10 @@
disabled
oneshot
+on early-init
+ exec - root -- /vendor/bin/qrtr-cfg 1
+ start qrtr-ns
+
on post-fs
start pd_mapper
exec - root -- /system/bin/sleep 1
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index f223cc4..d16f3fc 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -31,6 +31,8 @@
/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
@@ -40,3 +42,4 @@
/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
new file mode 100644
index 0000000..8344398
--- /dev/null
+++ b/sepolicy/qrtr.te
@@ -0,0 +1,8 @@
+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 };