ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Rename KM VM related system properties" into main

Browse source
This commit is contained in:
Alice Wang 2024-11-04 10:39:37 +00:00 • committed by Gerrit Code Review
commit abe7640a21
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc
View file

@ -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:trusty_vm_system.vm_cid=*
setprop system.keymint.trusty_ipc_dev VSOCK:${trusty_vm_system.vm_cid}:1
property:trusty.security_vm.vm_cid=*
setprop system.keymint.trusty_ipc_dev VSOCK:${trusty.security_vm.vm_cid}:1
start system.keymint.rust-trusty.nonsecure

10
trusty/utils/rpmb_dev/rpmb_dev.system.rc
View file

@ -24,7 +24,7 @@ service rpmb_mock_system /system_ext/bin/rpmb_dev.system \
# storageproxyd
on late-fs && \
property:trusty_vm_system_nonsecure.ready=1 && \
property:trusty.security_vm.nonsecure_vm_ready=1 && \
property:storageproxyd_system.trusty_ipc_dev=*
wait /dev/socket/rpmb_mock_system
start storageproxyd_system
@ -32,8 +32,8 @@ on late-fs && \
# RPMB Mock
on post-fs && \
property:trusty_vm_system_nonsecure.ready=1 && \
property:trusty_vm_system.vm_cid=*
property:trusty.security_vm.nonsecure_vm_ready=1 && \
property:trusty.security_vm.vm_cid=*
# Create a persistent location for the RPMB data
# (work around lack of RPMb block device on CF).
# file contexts secure_storage_rpmb_system_file
@ -49,12 +49,12 @@ on post-fs && \
mkdir /mnt/secure_storage_persist_system 0770 system system
symlink /metadata/secure_storage_persist_system \
/mnt/secure_storage_persist_system/persist
setprop storageproxyd_system.trusty_ipc_dev VSOCK:${trusty_vm_system.vm_cid}:1
setprop storageproxyd_system.trusty_ipc_dev VSOCK:${trusty.security_vm.vm_cid}:1
exec_start rpmb_mock_init_system
start rpmb_mock_system
on post-fs-data && \
property:trusty_vm_system_nonsecure.ready=1 && \
property:trusty.security_vm.nonsecure_vm_ready=1 && \
property:storageproxyd_system.trusty_ipc_dev=*
# file contexts secure_storage_system_file
mkdir /data/secure_storage_system 0770 root system