From 5d5c732a3b374c7992dfa79b6d62ea9f95119a0d Mon Sep 17 00:00:00 2001 From: Alice Wang Date: Wed, 30 Oct 2024 09:44:27 +0000 Subject: [PATCH] Rename KM VM related system properties To organize it under trusty and distinguish it from Widevine VM. Bug: 368502791 Test: launch_cvd --secure_hals=guest_keymint_trusty_insecure Test: atest VtsAidlSharedSecretTargetTest Change-Id: I48e43b9709e59b1cb9e1ba9113d5ef894469f485 --- ...ity.keymint-service.rust.trusty.system.nonsecure.rc | 4 ++-- trusty/utils/rpmb_dev/rpmb_dev.system.rc | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc b/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc index 2799188c4..ca6132e5e 100644 --- a/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc +++ b/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc @@ -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 diff --git a/trusty/utils/rpmb_dev/rpmb_dev.system.rc b/trusty/utils/rpmb_dev/rpmb_dev.system.rc index b78c4e2a1..52419ed18 100644 --- a/trusty/utils/rpmb_dev/rpmb_dev.system.rc +++ b/trusty/utils/rpmb_dev/rpmb_dev.system.rc @@ -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