diff options
| author | Tri Vo <trong@google.com> | 2020-07-22 23:40:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-22 23:40:46 +0000 |
| commit | 3442ec2c397c979b92944ee743572751c6f174bb (patch) | |
| tree | c1994e24a15a9fb89d1e1651b0e796bc11258086 | |
| parent | 4b2e1a8df47100934d14d9c5749ac2c8804c4f36 (diff) | |
| parent | dda6543abcd1861abb68194bf940756dc926cbab (diff) | |
| download | device_generic_trusty-3442ec2c397c979b92944ee743572751c6f174bb.tar.gz device_generic_trusty-3442ec2c397c979b92944ee743572751c6f174bb.tar.bz2 device_generic_trusty-3442ec2c397c979b92944ee743572751c6f174bb.zip | |
Merge "Add SPI proxy support" am: dda6543abc
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1340099
Change-Id: I76fd7381b31a06325d93bbdba8285ffe38020447
| -rw-r--r-- | qemu_trusty_base.mk | 1 | ||||
| -rw-r--r-- | sepolicy/file_contexts | 2 | ||||
| -rw-r--r-- | sepolicy/spiproxyd.te | 3 | ||||
| -rw-r--r-- | ueventd.qemu_trusty.rc | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk index 24de79d..438edc3 100644 --- a/qemu_trusty_base.mk +++ b/qemu_trusty_base.mk @@ -110,6 +110,7 @@ PRODUCT_COPY_FILES += \ # for Trusty $(call inherit-product, system/core/trusty/trusty-base.mk) $(call inherit-product, system/core/trusty/trusty-storage.mk) +$(call inherit-product, system/core/trusty/trusty-test.mk) # Test Utilities PRODUCT_PACKAGES += \ diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 22c1f88..3153bd1 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -1,6 +1,8 @@ /dev/trusty-ipc-dev0 u:object_r:tee_device:s0 /dev/vport3p1 u:object_r:rpmb_virt_device:s0 +/dev/vport3p2 u:object_r:spi_virt_device:s0 /vendor/bin/dhcpclient u:object_r:dhcpclient_exec:s0 +/vendor/bin/spiproxyd u:object_r:tee_exec:s0 /vendor/bin/storageproxyd u:object_r:tee_exec:s0 /data/vendor/var/run(/.*)? u:object_r:varrun_file:s0 /data/vendor/ss(/.*)? u:object_r:tee_data_file:s0 diff --git a/sepolicy/spiproxyd.te b/sepolicy/spiproxyd.te new file mode 100644 index 0000000..af35110 --- /dev/null +++ b/sepolicy/spiproxyd.te @@ -0,0 +1,3 @@ +type spi_virt_device, dev_type; + +allow tee spi_virt_device:chr_file { open read write }; diff --git a/ueventd.qemu_trusty.rc b/ueventd.qemu_trusty.rc index 0fd832e..159408a 100644 --- a/ueventd.qemu_trusty.rc +++ b/ueventd.qemu_trusty.rc @@ -1,2 +1,3 @@ /dev/vport3p1 0660 system system +/dev/vport3p2 0660 system system /dev/trusty-ipc-dev0 0660 system drmrpc |