diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-07-16 21:20:52 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-07-16 21:20:52 +0000 |
| commit | 2da2b0b44c2cbfc1d8e670c26b5db9fa6a021ede (patch) | |
| tree | a9ab555190d06efe4d3daf1e065ecc05c11cb850 | |
| parent | c3a1e48bb3cb0a2736c5000340ac9ad9a6b68b85 (diff) | |
| parent | ac5ab76ae185210f5eb94a50d9b7ae96fa81b95f (diff) | |
Snap for 6686656 from ac5ab76ae185210f5eb94a50d9b7ae96fa81b95f to sdk-releaseplatform-tools-30.0.4
Change-Id: I74f70148498426ae2fd3c089a43815b635cc1bb5
| -rw-r--r-- | db845c/BoardConfig.mk | 3 | ||||
| -rw-r--r-- | db845c/device.mk | 3 | ||||
| -rw-r--r-- | qcom/init.qcom.rc | 11 | ||||
| -rw-r--r-- | sepolicy/file_contexts | 3 | ||||
| -rw-r--r-- | sepolicy/qrtr.te | 8 |
5 files changed, 24 insertions, 4 deletions
diff --git a/db845c/BoardConfig.mk b/db845c/BoardConfig.mk index 20ca782..816c465 100644 --- a/db845c/BoardConfig.mk +++ b/db845c/BoardConfig.mk @@ -13,9 +13,6 @@ BOARD_KERNEL_PAGESIZE := 2048 BOARD_KERNEL_CMDLINE := earlycon firmware_class.path=/vendor/firmware/ androidboot.hardware=db845c BOARD_KERNEL_CMDLINE += init=/init androidboot.boot_devices=soc@0/1d84000.ufshc printk.devkmsg=on BOARD_KERNEL_CMDLINE += deferred_probe_timeout=30 -# fw_devlink=on, https://android-review.googlesource.com/c/1305327, broke android-mainline -# Set fw_devlink=permissive for the time being -BOARD_KERNEL_CMDLINE += fw_devlink=permissive # Image Configuration BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 #64M 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 @@ 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 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 @@ 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 + 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 }; |