Merge "trusty: keymint: rename trusty_ipc_dev property" into main

This commit is contained in:
Treehugger Robot 2024-09-19 19:45:51 +00:00 committed by Gerrit Code Review
commit 8da4af89fd

View file

@ -1,6 +1,6 @@
service system.keymint.rust-trusty.nonsecure \
/system_ext/bin/hw/android.hardware.security.keymint-service.rust.trusty.system.nonsecure \
--dev ${ro.hardware.trusty_ipc_dev.keymint:-/dev/trusty-ipc-dev0}
--dev ${system.keymint.trusty_ipc_dev:-/dev/trusty-ipc-dev0}
disabled
user nobody
group drmrpc
@ -12,6 +12,6 @@ service system.keymint.rust-trusty.nonsecure \
# TODO(b/357821690): Start the KeyMint HALs when the KeyMint VM is ready once the Trusty VM
# has a mechanism to notify the host.
on late-fs && property:ro.hardware.security.keymint.trusty.system=1 && \
property:ro.hardware.trusty_vm_cid=*
setprop ro.hardware.trusty_ipc_dev.keymint VSOCK:${ro.hardware.trusty_vm_cid}:1
property:trusty_vm_system.vm_cid=*
setprop system.keymint.trusty_ipc_dev VSOCK:${trusty_vm_system.vm_cid}:1
start system.keymint.rust-trusty.nonsecure